Compare commits

..
Author SHA1 Message Date
Egor Bogatov 360dca39d3 use gunichar2 for appctx_keys and appctx_values 2019-08-27 19:54:32 +03:00
Alexander Köplinger ae171d5ee6 Remove AppContext.cs that was moved to shared 2019-08-27 01:50:15 +02:00
Egor Bogatov 2efd81d9ed Move AppContext.CoreCLR.cs to shared, remove static ctor (#26045)
* Remove AppContext.CoreCLR.cs (move to shared)

Signed-off-by: dotnet-bot <[email protected]>
2019-08-26 23:25:16 +00:00
Stephen Toub a0307b1e34 Fix comment typo in ManualResetValueTaskSourceCore
Signed-off-by: dotnet-bot <[email protected]>
2019-08-27 01:24:57 +02:00
Vladimir Sadov 88ac3856eb Do not use AllocateUninitializedArray in private array pools. (#26338)
User may have extra expectations for the privatly owned array pools.
For example there could be an expectation that array never contains negative numbers (since user never puts them there). Uninitialized allocations can break such expectations.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-27 01:24:57 +02:00
Stephen Toub 82f618023f Disable SA1001 for LocaleData.Unix.cs
Signed-off-by: dotnet-bot <[email protected]>
2019-08-27 01:24:57 +02:00
Stephen Toub 39d62eb8c8 Separate Async*MethodBuilder types into their own files (#26364)
* Separate async method builder types into their own files

* Minor cleanup of AsyncTaskMethodBuilder types

* Split AsyncValueTaskMethodBuilder types into their own files

Signed-off-by: dotnet-bot <[email protected]>
2019-08-27 01:24:57 +02:00
Nikolay Sivov 515ec75154 [git] Set csharp diff pattern for *.cs sources. (#16495) 2019-08-27 01:24:30 +02:00
Jay Krell 67c97d30b4 Add missing const, particularly on functions "like" memcpy. (#16477)
But do not change the signatures of external functions.
2019-08-27 01:04:46 +02:00
Zoltan Varga 4f8c0b9b46 Merge pull request #16451 from vargaz/gc-handle-pin
[runtime] Make the local gc handles pin the object they point to by scanning the handle area conservatively.
2019-08-26 17:31:50 -04:00
Aleksey Kliger (λgeek) 78edafd6e2 [threadpool-io] Throw if backend won't be able to register a FD (#16396)
The poll+select i/o selector backend can't handle file descriptor ids greater
than FD_SETSIZE.  This can happen if too many files are open and we want to
wait on it.

Previously, mono would fail in the i/o selector thread by which point it was
too late to do anything.

With this change we will fail eagerly on the thread that calls IOSelector.Add
by throwing a NotSupportedException.

Addresses https://github.com/mono/mono/issues/15931
2019-08-26 17:13:45 -04:00
Egor Bogatov 85265d884c [netcore] Implement missing ThreadPool methods (for metrics) (#16076)
* Implement missing ThreadPool methods

* Address feedback

* ifdef for mono_threadpool_worker_get_completed_threads_count

* remove GetPendingUnmanagedWorkItemCount
2019-08-26 11:35:38 -04:00
Johan Lorensson f9be7a67d3 Fix special case tramp assert in x86/amd64. (#16476)
https://github.com/mono/mono/pull/16408 temporary fixed a tramp issue on
x86 (also exist on amd64). This commit fixes the underlying issue and re-enable
the use of noreturn outside of netcore.

The problem hit by the use of OP_NOT_REACHED on x86/amd64 is due to a specific
case when the address to patch happens to fall at the start of a different
managed method. Since the use of OP_NOT_REACHED can end a method
with the call instruction on x86/amd64 in combination with how patch location
(using the return address from stack) is resolved, the implementation in
mono_arch_patch_callsite didn't take this case into account, reading incorrect
patch data, triggering assert oh x86. So, based on timing we could end up with
the following code:

025715B3 call 02570D98
025715B8 push ebp

since the patch target is 025715B8, but also the start of a completely different
method, method_start == origin_code. The fix is to detect this case on x86/amd64
(done on each arch since the way origin_code is detected is arch specific)
and then use a method_start of NULL, that is already a supported scenario.
2019-08-26 16:46:43 +02:00
monojenkins 80504b8c98 [bcl] Update BCL Linked Size (#16427) 2019-08-26 14:01:25 +02:00
Jan Kotas 501b9cc3dd Fix BinaryReader.ReadChars for fragmented Streams (dotnet/coreclr#26324)
BinaryReader.ReadChars incorrectly read more than necessary from the underlying Stream when multi-byte characters straddled the read chunks.

Fixes https://github.com/dotnet/corefx/issues/40455

Signed-off-by: dotnet-bot <[email protected]>
2019-08-26 13:56:53 +02:00
Next Turn 366f2750cd Remove unnecessary !s for [DoesNotReturn] (dotnet/coreclr#26350)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-26 13:56:53 +02:00
Stephen Toub 37c6d154ef Contribute to IDE0055 (fix formatting)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-26 13:56:53 +02:00
Stephen Toub 2f11eff09b Contribute to StyleCop SA1002 (semicolon spacing)
However, I'm not enabling the rule permanently, as it disagrees with VS IDE0055 about the spacing around semicolons at the end of empty while and for loops.

Because this also impacts `for (;;)` loops, I also searched and replaced those with `while (true)`, to standardize on that across the codebase.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-26 13:56:53 +02:00
Stephen Toub a86fb8c847 Fix StyleCop warning SA1001 (spaces around commas)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-26 13:56:53 +02:00
Alexander Köplinger 2f2771fcfa [utils] Don't use MAP_32BIT on Apple platforms, fixes crash with XCode 11 beta6 (#16441)
As of XCode 11 beta6 the MacOSX SDK defines the MAP_32BIT symbol:

```diff
--- /Applications/Xcode11-beta5.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/include/sys/mman.h    2019-07-25 17:43:49.000000000 -0400
+++ /Applications/Xcode11-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/include/sys/mman.h    2019-08-06 21:03:07.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2019 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -145,6 +145,10 @@
 #define MAP_RESILIENT_CODESIGN  0x2000 /* no code-signing failures */
 #define MAP_RESILIENT_MEDIA     0x4000 /* no backing-store failures */

+#if !defined(CONFIG_EMBEDDED)
+#define MAP_32BIT       0x8000          /* Return virtual addresses <4G only: Requires entitlement */
+#endif  /* !defined(CONFIG_EMBEDDED) */
+
 #endif  /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */

 /*
```

This causes the mono_valloc() function to try to use the MAP_32BIT flag for mmap().

However as mentioned in the comment for the symbol in mman.h it seems to require a special entitlement
which isn't available/documented anywhere yet.
This in turn causes the mmap call to fail presumably because we're missing that entitlement.

Instead we now skip setting this flag on Apple platforms to make mmap() behave like it did before.
2019-08-26 13:53:40 +02:00
Egor Bogatov 6aaec2fe9b Optimized LLVM IR (#16448)
LLVM JIT: dump IR after optimizations 

```csharp
[MethodImpl(MethodImplOptions.NoInlining)]
static int Test(int a, int b, int c) => a * b + a * c;
```
`MONO_VERBOSE_METHOD="Test"` now prints both unoptimized and optimized IR:
```llvm
*** Unoptimized LLVM IR for P:Test ***

; Function Attrs: noinline uwtable
define monocc i32 @"P:Test (int,int,int)"(i32 %arg_a, i32 %arg_b, i32 %arg_c) #0 {
BB0:
  br label %BB3

BB3:                                              ; preds = %BB0
  br label %BB2

BB2:                                              ; preds = %BB3
  %t22 = mul i32 %arg_a, %arg_b
  %t25 = mul i32 %arg_a, %arg_c
  %t27 = add i32 %t22, %t25
  br label %BB1

BB1:                                              ; preds = %BB2
  ret i32 %t27
}
***


*** Optimized LLVM IR for P:Test ***

; Function Attrs: noinline uwtable
define monocc i32 @"P:Test (int,int,int)"(i32 %arg_a, i32 %arg_b, i32 %arg_c) #0 {
BB0:
  %t251 = add i32 %arg_b, %arg_c
  %t27 = mul i32 %t251, %arg_a
  ret i32 %t27
}
***
```
2019-08-26 07:36:04 -04:00
Jay Krell 6671316e35 [interp] Cleanup stackval_to_data and stackval_to_data_addr. (#16458)
No functional change, except for debugging, look up a frame
for the prior value.
2019-08-26 10:26:07 +02:00
Bernhard Urban b6ca76c484 [android] remove text relocations in AOT/arm32 (#16432)
[android] remove text relocations in AOT/arm32

Remove support for "big assemblies" for AOT on Android running on ARM 32bit. This will remove relocations in `.text` which are not allowed in the upcoming Android Q release anymore.

_If_ a customer should run into this problem, the suggested workarounds are:
* Switch to ARM64, or
* Do not use AOT compilation.

Fixes https://github.com/mono/mono/issues/16369
2019-08-26 03:46:12 -04:00
Ryan Lucia 510f3c7d70 Detect additional invalid assembly names when parsing (#16446) 2019-08-25 23:13:39 -04:00
Jay Krell e95ef822a1 Add MONO_LLVM_INTERNAL to mono_jit_compile_method. (#16463) 2019-08-25 23:52:17 +02:00
Jay Krell 2224d6b55d [interp] Outline mono_interp_box_vt. (#16454)
Contributes to https://github.com/mono/mono/issues/16172.

Seen to reduce frame from 0xB8 to 0xA8 on Linux/amd64/gcc against master.
Possibly similar elsewhere.
(Possibly 8 added to a rounded 8.)

Add const, add braces, they might help compiler and/or programmer.
2019-08-25 19:11:02 +02:00
Zoltan Varga 7d43ffda1a [runtime] Make the local gc handles pin the object they point to by scanning
the handle area conservatively.
2019-08-24 15:46:33 -04:00
Jay Krell 9d1eec6bf8 [interp] Outline STRMFLD_VT. (#16355)
Without being entirely scientific about it, this case seems
to be one that uses more than typical locals and therefore
be on a sort of critical path to reduce frame size.

I have a change that reduces frame to 0x78 bytes (albeit
not yet working) and to achieve that, in this case I refetched
the locals after function calls.

This achieves similar but perhaps more elegantly.

If we rest at larger frame size then this case might not be
on the critical path.

https://github.com/mono/mono/issues/16172
2019-08-24 09:56:40 +02:00
Jay Krell 99e9d80642 [windows gc] Trim one syscall per thread in garbage collection. (#16003)
* Skip one syscall per thread in garbage collection.
Specifically do not query for guard pages.
There are better ways:
 1. Visual C++ specific, __try / __except, get the guard page exception,
    put back the guard page. This is a little slower (exception + two syscalls),
    but exceedinly rare. __try itself is cheap on x86, free on the rest.
    This was also not allowed on UWP. It will be. And is VirtualProtectFromApp.

 2. Record the TEB and get from it the maximum commited page and just use MAX, trivial.

The comments are also not completely clear as to what is going on here, but they were close.
Augment them.
2019-08-24 09:56:00 +02:00
Jay Krell ab6a09741d Remove dlmalloc from Win32. (#15773) 2019-08-24 09:52:30 +02:00
Alexander Köplinger 3a409e8a7f Pass --clr-memory-model in csc/vbc wrapper script (#16439)
Should help with random CSC crashes on ARM (we've been using it in the Mono build for a while).
2019-08-24 00:08:25 +02:00
Zoltan Varga ab9c58d76d Merge pull request #16414 from vargaz/llvm-gc-poll-wrapper
[llvm] Add a mono wrapper method for the gc poll cold cconv wrapper so the EH code can unwind through it.
2019-08-23 18:06:17 -04:00
Ryan Lucia 83cf007ae3 Return an empty string for assemblies loaded from stream (#16345)
* Return an empty string for assemblies loaded from memory

* Blind attempt to fix wasm
2019-08-23 15:58:10 -04:00
Ryan Lucia 7615ba3e45 [netcore] Use requesting assembly's context for InternalLoad calls 2019-08-23 15:30:04 -04:00
Ryan Lucia 0661bf0424 [netcore] Random loader cleanup 2019-08-23 15:30:04 -04:00
Tarek Mahmoud Sayed cb1f7c0677 Cleanup GregorianCalendarHelper leap month checks (dotnet/coreclr#26321)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-23 15:43:54 +02:00
Alexander Köplinger 278fd48274 Bump corefx to get https://github.com/mono/corefx/pull/336 2019-08-23 14:43:05 +02:00
Zoltan Varga f0cbb79b7f Merge pull request #16431 from kjpou1/wasm-maindir-cleanup
[wasm] Small cleanup of main wasm directory
2019-08-23 08:13:21 -04:00
Zoltan Varga 97d2d97615 [jit] Make mono_unwind_frame () ignore registers which are greater than NUM_DWARF_REGS.
These registers can be encountered in the unwind info for functions with a cold
cconv, like xmm0 on amd64. Since they are caller saved, they don't have to
be restored during EH.
2019-08-23 07:49:20 -04:00
Zoltan Varga fdd0d7f027 Merge pull request #16429 from vargaz/llvm-jit-module
[llvm] Don't pass a module argument to the code in llvm-jit.cpp, we create a new LLVM module for each method.
2019-08-23 06:40:09 -04:00
Zoltan Varga 81f736e774 Fix the bitcode build. 2019-08-23 06:28:40 -04:00
Zoltan Varga 4ed1c3335f [llvm] Add a cold wrapper and mono wrapper for gc poll for JITted code as well. 2019-08-23 05:34:52 -04:00
Kenneth Pouncey f5717d21bb Address review comments wasm/support to wasm/src 2019-08-23 11:11:57 +02:00
Zoltan Varga 0d603261a0 Fix the build. 2019-08-23 04:41:50 -04:00
Zoltan Varga f6b189ecab [llvm] Add a mono wrapper method for the gc poll cold cconv wrapper so the EH code can unwind through it. 2019-08-23 04:41:50 -04:00
Zoltan Varga 8ace375450 Merge pull request #16407 from vargaz/fix-llvm-simd
[llvm] Fix type issues in the llvm IR emitted for SIMD. Fix a warning.
2019-08-23 04:41:10 -04:00
Zoltan Varga 14a76b03c5 Merge pull request #16408 from vargaz/noreturn-methods
[jit] Special case the ThrowHelper methods only on netcore.
2019-08-23 04:40:28 -04:00
Egor Bogatov 47efe6bab0 Merge pull request #16412 from EgorBo/fix-ci4
[netcore] Fix CI, ignore failing tests
2019-08-23 11:17:31 +03:00
Kenneth Pouncey 8b338a9619 [wasm] Small cleanup of main wasm directory
- Move source support files for custom building the wasm runtimes to a new directory called `wasm/support`
- Modified `packager.exe` to build from this new subdir.
- Updated the README.md to document the change.
2019-08-23 09:59:31 +02:00
Zoltan Varga c357de87ec [llvm] Don't pass a module argument to the code in llvm-jit.cpp, we create a new LLVM module for each method. 2019-08-23 03:27:41 -04:00
Zoltan Varga c97bfe2167 Merge pull request #16379 from EgorBo/improve-dump
Improve MONO_VERBOSE_METHOD
2019-08-23 02:08:12 -04:00
Michal Strehovský 9bffb810ee Mark methods specially handled in JitInterface Intrinsic (#26209)
* Mark methods specially handled in JitInterface Intrinsic

For CPAOT compiler's sake.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-23 00:51:24 +02:00
coypoop f626f3e7aa If either sched_get_priority_{min,max} failed, don't try to set a priority (#15898)
netbsd and linux both require that if SCHED_OTHER is used, a fixed value is used for sched_param ([0 for linux](http://man7.org/linux/man-pages/man7/sched.7.html), -1 for netbsd)

the netbsd case can also be detected by the [POSIX-defined failure](https://pubs.opengroup.org/onlinepubs/007908799/xsh/sched_get_priority_min.html) return value for sched_get_priority_min, a return value of -1.
2019-08-23 00:46:08 +02:00
EgorBo 71dce6502a ignore FSW test 2019-08-23 01:12:47 +03:00
Martin Baulig 473d07a86c Fix issue in SafeHandle.DangerousReleaseInternal() that caused #16034. (#16244)
Using the CoreCLR version of this line fixed the problem and my investigations
also revealed why.

The `SafePipeHandle` contains a reference to both the Socket as well as the
`SafeSocketHandle`, taking ownership of them.  If there are no additional
references to either of them, so that both are collected in the same GC pass,
their finalizer may be invoked in any order.

If the Socket gets finalized first, it's `SafeSocketHandle` will have a `_mstate`
of 8 (two references) at the beginning of `DangerousReleaseInternal()` - which
will set it to 6 (one reference plus disposed flag).

Then when the `SafePipeHandle` gets collected, it will call `DangerousRelease ()`
on it's `SafeSocketHandle`.  As mentioned above, it's `_mstate` will be 6.
Now we own the handle, so we'll decrease it's reference count by one and set the
`Closed` flag - the new `_mstate` should thus be 3.

However, using

    new_state = (old_state & RefCount_Mask) - RefCount_One;

would set it to 1 - thus effectively clearing the `Disposed' flag.  And since it's
reference count is now also zero, the next finalize pass will then throw.

The CoreCLR version of this class uses

    new_state = old_state - RefCount_One;

which fixes this.
2019-08-22 23:46:31 +02:00
EgorBo 692f70cb67 ignore more tests 2019-08-22 23:08:44 +03:00
EgorBo 40cf68aa98 Disable the whole System.ComponentModel.Composition namespace 2019-08-22 21:47:45 +03:00
Stephen Toub f5a1fa4744 Fix IDE0034 (simplify default expression)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub f256a4525d Fix IDE0054 (use compound assignment)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub e2c7b4200a Fix (mostly) IDE0055 (formatting)
Lots of various spacing issues.  I say "mostly" because I explicitly undid some changes that added to rather than reduced inconsistency, e.g. region indents.  We can revisit that later.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub 9be0c2217c Fix StyleCop warning SA1114 (parameter list should follow declaration)
Fixed just be removing stale/unnecessary comments.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub d3817c9302 Fix StyleCop warning SA1006 (empty statements)
This is just running the rule and auto-fixing everything.  I undid changes that converted e.g. `while (...);` to `while (...) { }`.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub 35d8ca894b Fix StyleCop warning SA1005 (single line comment spacing)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub 55bc2fee8a Fix (mostly) StyleCop warning SA1003 (operator symbol spacing)
The "mostly" here is that I undid changes where it was forcing formatting around a `: this` or `: base` call for a ctor, in particular where it was moving one up from the next line to be at the end of the current line.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub e23c35f730 Fix StyleCop warning SA1024 (colon spacing)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub 26656df25e Fix StyleCop warning SA1015 (closing generic brace spacing)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub f3b0e98aae Fix StyleCop warning SA1013 (closing brace spacing)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub ac42e06fea Fix StyleCop warning SA1012 (opening brace spacing)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub 8c01fd5189 Fix StyleCop warning SA1008 (opening paren spacing)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub f83a8da0ce Fix StyleCop warning SA1002 (semicolon spacing)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
Stephen Toub 46302d54aa Fix StyleCop warning SA1001 (commas followed by whitespace)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 20:21:18 +02:00
EgorBo 7678654781 fix macOS 2019-08-22 20:53:14 +03:00
Steve Pfister fbdad78101 Added a workaround for an issue with the compiler server on 32-bit linux. (#16405)
Currently, if the process is 32-bit, roslyn tries to determine how much
memory is available.  To do that, it tries to pinvoke into GlobalMemoryStatusEx,
which is not supported on mono.

Without it, the compiler server bombs on https://github.com/dotnet/roslyn/blob/0e63260c5afb3fb5b74c357dd250e500172bcd63/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs#L55-L59
2019-08-22 18:22:22 +02:00
EgorBo 779fda5103 update rsp 2019-08-22 19:02:53 +03:00
EgorBo f809fe55a8 ignore some tests 2019-08-22 18:52:52 +03:00
Stephen Toub 4dd0a137a4 Avoid race condition in DiagnosticCounter (dotnet/coreclr#26260)
* Avoid race condition in DiagnosticCounter

If while a DiagnosticCounter instance is being created the timer fires to process counters, the timer may end up evaluating a DiagnosticCounter whose constructor or derived types' constructor hasn't finished configuring the instance's state yet.

* Remove unnecessary #if

Signed-off-by: dotnet-bot <[email protected]>
2019-08-22 16:59:43 +02:00
Nikolay Sivov 068660732f [corlib] Improve file:// url handling in AppDomainSetup. (#16161)
* [corlib] Improve file:// url handling in AppDomainSetup.

WiX 3 installer toolkit uses file:/// prefix when setting ApplicationBase for newly created domain.
Currently this leads to invalid path exception:

file:///C:\... -> /C:\... -> full path expansion with current workdir on different drive -> Y:\C:\...

Later it fails check for multiple ':' -> NotSupportedException ("The given path's format is not supported.").

This patch uses logic already present in AppDomain::Load().

* [Test] Add a test for file:/// application base.

* [Test] Fix test failure on Windows.

* [corlib] Simplify file: protocol check for AppDomainSetup.
2019-08-22 16:54:32 +02:00
Zoltan Varga 49f913ac8a [jit] Special case the ThrowHelper methods only on netcore. 2019-08-22 10:36:43 -04:00
Zoltan Varga f2f58e522b [llvm] Fix type issues in the llvm IR emitted for SIMD. Fix a warning. 2019-08-22 10:28:47 -04:00
Aleksey Kliger (λgeek) e74736a471 [android] mono_dl_open_file: use g_file_test only on absolute paths (#16387)
The intention of calling `g_file_test (file, G_FILE_TEST_EXISTS)` where file is
the name of a shared library we want to open is to speed up probing for
non-existent libraries.

See https://github.com/mono/mono/pull/12074

The problem is that if file is just a simple "libdl.so" then `dlopen (file)`
doesn't just look for it in the current working directory, it will probe some
other paths too.  (For example on desktop linux you'd also look in all the
directories in LD_LIBRARY_PATH).  So the g_file_test() call is not a robust way
to avoid calling dlopen if the filename is relative.

But it actually broke more things: https://github.com/xamarin/xamarin-android/issues/3388

When probing for "libdl.so" on Android mono_lookup_pinvoke_call will first try
prepending some paths that it knows about and we end up calling
`dlopen ("/system/lib/libdl.so")` which will fail because Bionic has security
restrictions on what code can dlopen something from /system/lib with an
absolute path.  Eventually mono_lookup_pinvoke_call will go back to trying the
bare "libdl.so" which hits `g_file_test` and returns NULL.

The new code only does the file test if we pass it an absolute path, which
gives Bionic's dlopen a chance to deal with relative paths however it needs to.
2019-08-22 10:10:09 -04:00
Zoltan Varga f6b0c9b772 Merge pull request #16300 from EgorBo/llvm-fpm
Use basic LLVM optimizations (PassManager) in JIT mode
2019-08-22 09:07:02 -04:00
Jay Krell 5368fef5ee [interp] Replace endsp with preexisting child_frame.retval which appears equivalent. (#16378)
This should conserve stack. I didn't verify it.
child_frame being address-taken, compiler would struggle to remove it.
So we have the same value in two places.

https://github.com/mono/mono/issues/16172
2019-08-22 14:57:38 +02:00
Zoltan Varga 87a6364d58 Merge pull request #16390 from EgorBo/intptr-intrinsic
Make IntPtr.Zero intrinsic
2019-08-22 08:43:07 -04:00
Zoltan Varga 341cc0dd83 Merge pull request #16386 from vargaz/llvm-inline-limit
[llvm] Use a different inline limit (30) for llvm+aot.
2019-08-22 08:26:10 -04:00
Zoltan Varga 3f21a2c8f3 Merge pull request #16384 from vargaz/fix-16381
[llvm] Fix an assert.
2019-08-22 07:26:36 -04:00
Zoltan Varga 254d6d3758 Merge pull request #16389 from vargaz/fix-16380
[aot] Simplify a check to avoid calling into the assembly loading code while loading the aot image for corlib.
2019-08-22 05:36:17 -04:00
Zoltan Varga b7ca80ed58 Add comments. 2019-08-22 00:34:32 -04:00
Egor Bogatov 279676f43e Update llvm-jit.cpp 2019-08-22 01:46:10 +03:00
Egor Bogatov d02695ef47 cleanup 2019-08-22 01:43:56 +03:00
Egor Bogatov 1822f2faab Merge remote-tracking branch 'origin/master' into llvm-fpm 2019-08-22 00:47:40 +03:00
Bernhard Urban 5c9be2dc2b [netcore] Use Release configuration for default System.Private.CoreLib build (#16391)
It seems the Configuration set inside of the System.Private.CoreLib.csproj is just completely ignored, making it default to "Debug".

Maybe because we're using Microsoft.NET.Sdk ?
2019-08-21 23:16:03 +02:00
Egor Bogatov cb34178cd6 use EMIT_NEW_PCONST 2019-08-21 21:48:14 +03:00
Egor Bogatov d3ecd70ead Make IntPtr.Zero intrinsic 2019-08-21 21:23:19 +03:00
Zoltan Varga c4de19ef09 [aot] Simplify a check to avoid calling into the assembly loading code while loading the aot image for corlib.
Fixes https://github.com/mono/mono/issues/16380.
2019-08-21 14:15:25 -04:00
Zoltan Varga 433b9a7f70 [llvm] Use a different inline limit (30) for llvm+aot. 2019-08-21 12:20:50 -04:00
Zoltan Varga 0e2da3c2ab [llvm] Fix an assert.
Fixes https://github.com/mono/mono/issues/16381.
2019-08-21 12:03:20 -04:00
EgorBo ad713a70ef Merge remote-tracking branch 'origin/master' into llvm-fpm 2019-08-21 14:20:57 +03:00
Egor Bogatov 50b57fe926 Update mini.c 2019-08-21 14:07:59 +03:00
Egor Bogatov 6bb1e5ffc4 Update mini-llvm.c 2019-08-21 14:07:02 +03:00
Egor Bogatov e5acc9be7a undo change in mini.c 2019-08-21 14:04:57 +03:00
Egor Bogatov b0b3743f36 Improve MONO_VERBOSE_METHOD 2019-08-21 13:35:40 +03:00
Kenneth Pouncey 935d0a54e7 [wasm] Make sure message pump is working when run via webworker. (#16325)
- Tests if we are running in ENVIRONMENT_IS_WORKER
   - run message pump if we are.

- This also fixes gc not running.

issue: https://github.com/mono/mono/issues/16319
2019-08-21 06:24:06 +02:00
Zoltan Varga 977ccf7cb2 Merge pull request #16363 from vargaz/tp-thread-name
[runtime] Avoid resetting the tp thread name on every call to worker_callback ().
2019-08-20 23:14:44 -04:00
Zoltan Varga 285f33efe6 Merge pull request #16286 from vargaz/netcore-simd
[netcore] Add a netcore version of simd-intrinsics.c.
2019-08-20 23:11:27 -04:00
Alexander Köplinger 38c524cc2a Fix Windows build 2019-08-20 22:55:39 +02:00
Alexander Köplinger 55f2c4d6ad [profiler] Rename helper functions to have common prefix
Unfortunately https://github.com/mono/mono/pull/16335 didn't fix the new symbols showing up in the log profiler module.
The reason is that we actually pass `--disable-visibility-hidden` for iOS builds in https://github.com/mono/mono/blob/0b6d95e8ce7c882e2db9e89fa0dec850c687f65e/sdks/builds/ios.mk#L98.

Rename the helper functions instead to have a common prefix so they can be ignored in xamarin-macios tests.
2019-08-20 22:55:39 +02:00
Aleksey Kliger ed0063b4d5 [w32socket] Translate some errno codes to WSA_ errors imprecisely.
These aren't a perfect match, but better than falling into the `default` case
where Mono asserts and crashes.

Addresses part of https://github.com/mono/mono/issues/16024
2019-08-20 16:13:41 -04:00
Aleksey Kliger c38044d74f [w32error] Add WSA_INVALID_PARAMETER and WSA_INVALID_HANDLE 2019-08-20 16:13:41 -04:00
Ryan Lucia fc5e3fa039 [netcore] Remove local copy of static alc resolve methods 2019-08-20 21:25:00 +02:00
Ryan Lucia 3b47d28e37 Move AssemblyLoadContext VM-invoked static resolve methods to shared (#26248)
Shared between CoreCLR and Mono. Mono began using a copy of these methods with https://github.com/mono/mono/pull/16256/

Signed-off-by: dotnet-bot <[email protected]>
2019-08-20 21:25:00 +02:00
Alexander Köplinger a147402d07 [ci] FreeBSD: Make sure we have gmake in /usr/bin 2019-08-20 21:08:54 +02:00
Alexander Köplinger ac3aa7c1c7 Bump corefx to get https://github.com/mono/corefx/pull/332 2019-08-20 20:52:02 +02:00
Stephen Toub 5f38497e19 Remove unused usings from Corlib (dotnet/coreclr#26250)
* Fix IDE0065 (misplaced using)

* Fix IDE0005 (remove unnecessary usings)

Signed-off-by: dotnet-bot <[email protected]>
2019-08-20 19:45:30 +02:00
madmir 4dd016004b Re-enable xunit warning 1019 (dotnet/corefx#40415)
Make MemberData reference IEnumerable<object[]>

Signed-off-by: dotnet-bot <[email protected]>
2019-08-20 19:45:30 +02:00
Ryan Lucia 0b6d95e8ce [netcore] Remove unnecessary calls to mono_domain_get (#16336)
Should use mono_alc_domain where possible
2019-08-20 12:55:54 -04:00
Alexander Köplinger 5dc4a86d9d [netcore] Consolidate running tests between AzDO pipeline and Makefile (#16348)
* [netcore] Consolidate running tests between AzDO pipeline and Makefile

There was some unnecessary duplication between the two that we can remove.

* Add timeout to test execution
2019-08-20 17:59:55 +02:00
Zoltan Varga 8a413fad71 Fix the build. 2019-08-20 11:32:46 -04:00
Zoltan Varga b5cfeb3b5b [runtime] Avoid resetting the tp thread name on every call to worker_callback (). 2019-08-20 11:31:12 -04:00
Phil Jaenke b7dc4f0a46 Fix Jenkins build failure due to missing dependencies (#16362)
Jenkins builds are failing due to missing gettext; also realized that graphics unit tests will fail without some additional packages that will not be pulled in automatically.

Added:
`gettext-runtime gettext-tools cairo libdrm mesa-dri mesa-libs`
2019-08-20 16:19:36 +02:00
Jo Shields 3070ab6a96 Pass -fvisibility=hidden to profiler modules. (#16335)
* Pass -fvisibility=hidden to profiler modules.

This appears to not break the profilers:

```
directhex@breakfast:/tmp$ nm -g /tmp/ponyponyponypony/lib/libmono-profiler-log.so | grep close_socket_fd
directhex@breakfast:/tmp$
directhex@breakfast:/tmp$ /tmp/ponyponyponypony/bin/mono --profile=log:report bottle.exe
99 bottles of beer on the wall, 99 bottles of beer.
Take one down and pass it around, 99 bottles of beer on the wall.

[..]

No more bottles of beer on the wall, no more bottles of beer.
Go to the store and buy some more, 99 bottles of beer on the wall.

Mono log profiler data
	Profiler version: 3.0
	Data version: 17
	Arguments: log:report
	Architecture: x86-64
	Operating system: linux
	Mean timer overhead: 86 nanoseconds
	Program startup: Mon Aug 19 14:18:30 2019
	Program ID: 17715
	Server listening on: 41539

JIT summary
	Compiled methods: 753
	Generated code size: 228046
	JIT helpers: 0
	JIT helpers code size: 0

GC summary
	GC resizes: 0
	Max heap size: 0
	Object moves: 0

Metadata summary
	Loaded images: 3
	Loaded assemblies: 3

Exception summary
	Throws: 0
	Executed finally clauses: 3

Thread summary
	Thread: 0x7fcd968c9700, name: "Finalizer"
	Thread: 0x7fcd966c8700, name: "Profiler Sampler"
	Thread: 0x7fcd9b036780, name: "Main"
	Thread: 0x7fcd964c7700, name: "Profiler Helper"
	Thread: 0x7fcd954c5700, name: "Profiler Dumper"
	Thread: 0x7fcd95cc6700, name: "Profiler Writer"

Domain summary
	Domain: (nil), friendly name: "bottle.exe"

Context summary
	Context: (nil), domain: (nil)

Counters:
	Mono System:
		User Time                      : 70.000ms
		System Time                    : 0.000ms
		Total Time                     : 140.000ms
		Working Set                    : 22032384
		Private Bytes                  : 63455232
		Virtual Bytes                  : 449630208
		Page Faults                    : 3004
		CPU Load Average - 1min        : 1.870000
		CPU Load Average - 5min        : 2.670000
		CPU Load Average - 15min       : 2.900000
	Mono JIT:
		Methods from AOT               : 536
		Methods JITted using mono JIT  : 154
		Methods JITted using LLVM      : 0

```

* Add missing annotations and includes
2019-08-20 16:17:26 +02:00
Calvin Buckley b57d52ce77 Fix minizip compile on Haiku (#16301)
it doesn't have f*64 funcs, it seems
2019-08-20 16:00:24 +02:00
Jay Krell 169205813b [interp] Outline box_nullable. (#16356)
Without being entirely scientific about it, this case seems
to be one that uses more than typical locals and therefore
be on a sort of critical path to reduce frame size.

I have a change that reduces frame to 0x78 bytes (albeit
not yet working) and to achieve that, in this case I refetched
the locals after function calls.

This achieves similar but perhaps more elegantly.
If we rest at larger frame size then this case might not be on the critical path.

https://github.com/mono/mono/issues/16172.
2019-08-20 15:53:25 +02:00
Jan Kotas 1592d2a8fa Change missed by the mirror (dotnet/coreclr#26251)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-20 15:37:10 +02:00
Phil Jaenke 317e741c02 Many updates to freebsd.sh (#16342)
* Many updates to make it better

Too much to list by many measures. This makes sure appropriate kernel modules, file systems, build packages, supplemental packages, and directories are installed or created as appropriate. This also addresses a known failure condition in System.Security-xunit due to a missing directory resulting in ownership problems.

* Make corrections for Azure

I don't have an Azure to test with, so I missed that the script is calling with `-e` and that Azure uses a non-`GENERIC` kernel with procfs baked in (likely required for Azure drivers.)
2019-08-20 15:35:18 +02:00
Jay Krell ea29349f77 [interp] Reduce register/stack pressure esp. around vtable initialization. (#16349)
Part of #16172 though not necessarily any gain from this change, at this time.
2019-08-20 13:03:12 +02:00
Alexander Köplinger b205f1bd9c [interp] Reduce register/stack pressure slightly, i.e. so that field does not have (#16339)
to be preserved across `mono_get_special_static_data ()` if non-volatile registers
are all otherwise allocated.
2019-08-20 12:04:30 +02:00
Jay Krell 33153ddd2d [interp] Relieve register/stack pressure around mono_thread_internal_current. (#16341)
Part of #16172 though not necessarily any gain from this change, at this time.
We might want to expose ifdef and inline mono_thread_internal_current also or instead.
2019-08-20 12:03:48 +02:00
Alexander Köplinger 5ebce09c51 Bump bockbuild to get gtksharp 2019-08-20 11:54:59 +02:00
Jay Krell bc2accfc7e Fix warnings. (#16287)
debug-mono-ppdb.c ppdb_compressed_size may be used uninitialized
   ppdb_size may be used uninitialized
 image.c iinfo set but not used
 icall.c klass set but not used
2019-08-20 11:47:38 +02:00
Alexander Köplinger 9a5ae23f7e [netcore] Use Release configuration for CI builds (#16329)
* [netcore] Use Release configuration for CI builds

Fixes https://github.com/mono/mono/issues/16308

* [ci] Ensure the artifacts/logs/Release folder exists

Some arcade steps need the path to exist and we only create artifacts/logs/Debug right now,
because that folder is created by eng/common/tools.sh used by init-tools.sh defaulting to Debug.
2019-08-19 23:52:01 +02:00
Jay Krell 31aed632ba [interp] Inline MINT_NEWOBJ_VTST_FAST (#16314)
For purposes of stack savings, only MINT_NEWOBJ_VT_FAST w/o the "ST"
needed to be outlined, and inlining also the ST form increased
its stack use, w/o savings elsewhere.

That is, the recursive cases should generally not be outlined.
We were outlining two. We still outline one.

This is partially undoing my recent change, where I outlined both of these, but only one was justified.
2019-08-19 23:48:20 +02:00
Jay Krell 2313f1a884 [interp] Reduce register/stack pressure slightly, i.e. so that field does not have
to be preserved across `mono_get_special_static_data ()` if non-volatile registers
are all otherwise allocated.
2019-08-19 13:02:49 -07:00
Ryan Lucia 7c3dfbcbdf [netcore] Update ALC test exclusions (#16332) 2019-08-19 14:50:15 -04:00
Aleksey Kliger (λgeek) 2f0cbb5aa5 [coop] Add a handle frame in construct_culture (#16299)
Otherwise we see warnings like these:

```
ves_icall_System_Globalization_CultureInfo_internal_get_cultures_raw USED 680 handles
```
2019-08-19 11:01:09 -04:00
Alexander Köplinger 0ad1f5cca1 [ci] Add CI VM provisioning script for FreeBSD to the repo (#16326)
We'll download it from GitHub instead of storing it in Jenkins admin config.

Trial run with FreeBSD for moving all the other provisioning scripts to the repo too.
2019-08-19 14:44:00 +02:00
Martin Baulig a3c31b9ef7 Add missing Dispose() call on error in MonoTlsStream.CreateStream(). (#16233)
* Add missing `Dispose()` call on error in `MonoTlsStream.CreateStream()`.

* Remove the `finally` block to make it more easy to read.
2019-08-19 14:23:28 +02:00
Vincent Povirk 9f790cd5e2 eglib: Remove broken executable test on Windows. (#16295)
The strcmp is wrong, and it doesn't test anything meaningful anyway.

This flag is unused since #16156 was merged.
2019-08-19 13:09:14 +02:00
Jan Kotas a723047f68 Fix CoreRT build breaks
Signed-off-by: dotnet-bot <[email protected]>
2019-08-19 13:07:13 +02:00
Stephen Toub ad63045907 Remove useless GetLongPathNameW call (dotnet/coreclr#26210)
Immediately after calling this we're going to loop around and call it again at the beginning of the while loop.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-19 13:07:13 +02:00
Jay Krell 8886f71b2c [interp] Remove InterpFrame.locals, replace with reasonably efficient frame_locals macro.o (#16317)
Contributes to #16172.
2019-08-19 11:50:20 +02:00
Alexander Köplinger e754bb1c43 [interp] Put finally data back in locals instead of frame to save 16 bytes of stack. (#16307)
* Put finally data back in locals instead of frame to save 16 bytes of stack.

Partial undo of f8fd60b5c0.

* Add comments explaining goto main_loop vs. MINT_IN_DISPATCH.
2019-08-19 11:24:44 +02:00
Jay Krell 60cd1b3556 [interp] Outline ves_array_element_address to save 16 bytes of stack on Linux/amd64/clang. (#16304)
Contributes to #16172.
2019-08-19 11:24:10 +02:00
Alexander Köplinger 9001c4fa83 thread names: coop, constants, usually ignore-error. (#16272)
- Convert setting thread name to be coop-compatible.

- For constant thread names, just retain the constant, not a copy.
  This includes producing and using constant unicode thread names on Windows.

- Make setting a thread name often non-fatal, except where mandated by public API.

- From earlier PR: mono_free (mono-publib.c) would no longer be referenced and therefore
  no longer exported. That broke profilers and maybe other externals.
  Choices:
     1 Use it instead of g_free randomly sometimes.
     2 Call it randomly sometimes.
     3 include it in external-only.c or object.c
     4 Mark it external only (breaks profiler).
     5 Use a .def file or Unix equivalent.

     5 is best, 2 is done here, the advantages/disadvantages
     among most choices are subtle. 3 is probably better than 2
     but is slightly bigger change, to put off -- you'd stop
     compiling mono-publib.c and move it to include/extra_redist.

     The advantage of not-.def file is perhaps that it is exposed
     by the compiler, so maybe easy to port and work with.
     People are more comfortable with obscure C extensions than
     any linker options, and there are multiple linkers to contend
     with. Arguably there are fewer compilers.
2019-08-19 11:23:23 +02:00
Jay Krell cf0ce4f55a Reduce size of internal MonoErrors by 3 pointers, while trying to be compatible with old size.(#16218)
There is an incompatibility here.

If Mono hands off an InternalError and it is accessed
like an ExternalError, like memset(sizeof()), bad.

Hopefully nobody does that.

There is also compatability -- embedders can continue to embed MonoError
in their own data. Its size and hopefully alignment is unchanged.
2019-08-19 11:20:37 +02:00
Jay Krell 047c7d35fa [interp] Replace frame.args with frame.stack, the same except for type (#16316)
Contributes to #16172.
2019-08-19 11:19:10 +02:00
Vlad Brezae 975b543e92 [interp] Make sure we allocate stack for MINT_LD_DELEGATE_INVOKE_IMPL (#16224)
* [interp] Make sure we allocate stack for MINT_LD_DELEGATE_INVOKE_IMPL

This opcode is pushing a function pointer from the delegate, so it needs to have stack reserved.

* [interp] Fix overflow of stack space
2019-08-19 11:59:21 +03:00
Jay Krell cecea63691 warning: mono-threads-wasm.c no previous prototype for function mono_background_exec (#16289) 2019-08-19 05:22:06 +02:00
Stephen Toub 04909573e7 Undo use of Index/Range in files compiled into netfx-compat assemblies
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 22:12:06 +02:00
Stephen Toub 424af0fb98 Fix DecoderExceptionFallbackBuffer message (dotnet/coreclr#26211)
When the number of unknown bytes is exactly 20, the message includes a misleading " ..." at the end.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 22:12:06 +02:00
Jay Krell d1f47e7b48 [interp] Reduce register/stack pressure slightly. (#16303)
No savings on Linux/amd64/gcc/clang.
2019-08-18 17:36:33 +03:00
Zoltan Varga e1b57c371a Fix the build. 2019-08-18 08:48:15 -04:00
Zoltan Varga 4503b67a0b Implement a subset of Intel BMI1/BMI2 intrinsics used by corelib. 2019-08-18 06:08:31 -04:00
Zoltan Varga 7337a3e405 Add support for Bmi1 instrinsics. 2019-08-18 05:25:04 -04:00
Zoltan Varga 157bb9f4e3 Make simd-methods-netcore.h less verbose. 2019-08-18 05:23:15 -04:00
Zoltan Varga 121d9ca4a9 [jit] Don't mark ThrowForUnsupportedVectorBaseType<T> as do-not-return. Assert that do-not-return methods actually don't return. 2019-08-18 03:18:24 -04:00
Zoltan Varga 7e76abb4ca [llvm] Add support for 32 byte AVX types, not enabled yet. 2019-08-18 02:01:10 -04:00
Zoltan Varga 1a9f9fb927 [llvm] Compute cpu features lazily. 2019-08-18 01:57:14 -04:00
Zoltan Varga 3c6e8de0da [jit] Enable alias analysis dce even if there are no ldaddr instructions eliminated, they could have been eliminated earlier. Enable only for netcore for now. 2019-08-18 01:55:25 -04:00
Zoltan Varga c0e03ef28f [llvm] Fix support for 32 byte simd values. 2019-08-18 01:40:28 -04:00
Stephen Toub c48dd0608d Fix IDE0025 (use expression body for properties)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub 2e9134f1a6 Fix IDE0056 (use index operator)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub 08b942ab68 Fix IDE0057 (use range operator)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub 9595189a0a Fix IDE0054 (use compound assignment)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub c8eb6972b5 Fix IDE0060 (unused parameter)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub 64f4ba27f0 Fix IDE0059 (unnecessary assignment)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub 71fcdf53e3 Fix IDE0029 (use coalesce expression)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub 828f89360f Fix IDE0031 (use null propagation)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub 8af19427ad Fix IDE0028 (collection initializers)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub 20adb69c73 Fix IDE0008 (use explicit type instead of var)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub 8dd17900cc Fix IDE0065 (using directives should be outside of a namespace)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Stephen Toub c0191b2575 Fix IDE0019/20 (Use pattern matching)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-18 07:01:54 +02:00
Kenneth Pouncey 02126de318 Add regression test for issue https://github.com/mono/mono/issues/12917
- IL Linker not working correctly with IQueryable extensions
2019-08-17 17:50:39 -05:00
Jay Krell 9a24e9a389 Add comments explaining goto main_loop vs. MINT_IN_DISPATCH. 2019-08-17 15:45:21 -07:00
Zoltan Varga 9df02d7a2d Fix the build. 2019-08-17 17:22:41 -04:00
Stephen Toub 2e618f0e63 Fix IDE0066 across corefx (dotnet/corefx#40288)
* Fix IDE0066 across corefx

"Fix all", but then manual tweaking to accommodate places the rule doesn't work quite right.

* Address PR feedback

Signed-off-by: dotnet-bot <[email protected]>
2019-08-17 23:07:24 +02:00
Zoltan Varga 44cfea466f Fix the build. 2019-08-17 12:26:35 -04:00
Zoltan Varga 7418248835 Add support for the System.Runtime.Intrinsics.X86.Popcnt intrinsics. 2019-08-17 12:25:59 -04:00
Zoltan Varga bfe4155083 [llvm] Add support for querying the cpu attributes from the LLVM jit. 2019-08-17 12:25:58 -04:00
Zoltan Varga b39abe5365 Fix the build. 2019-08-17 12:25:31 -04:00
Zoltan Varga 9eb687f2b9 Fix the windows build. 2019-08-17 12:25:31 -04:00
Zoltan Varga 98a02059e8 [jit] Add a netcore version of simd-intrinsics.c.
Differences from the old versions:
- Only Vector<T> from corelib is supported.
- Only LLVM is supported.
- It uses more general opcodes like XBINOP instead of having one opcode
  for every op+type combination which is not useful for LLVM.
2019-08-17 12:25:30 -04:00
Zoltan Varga 2c32eb1fa8 [jit] Optimize away box+unbox combinations which are common in corefx code. 2019-08-17 12:25:30 -04:00
Zoltan Varga 13fb0134a0 Merge pull request #16210 from EgorBo/opt-llvm-jit
Auto-detect current cpu in LLVM JIT
2019-08-17 12:22:07 -04:00
Jay Krell 3fb7834afb Put finally data back in locals instead of frame to save 16 bytes of stack.
Partial undo of f8fd60b5c0.
2019-08-17 00:05:50 -07:00
Jay Krell 0c6cb9fbc3 thread names: coop, constants, usually ignore-error.
- Convert setting thread name to be coop-compatible.

- For constant thread names, just retain the constant, not a copy.
  This includes producing and using constant unicode thread names on Windows.

- Make setting a thread name often non-fatal, except where mandated by public API.

- From earlier PR: mono_free (mono-publib.c) would no longer be referenced and therefore
  no longer exported. That broke profilers and maybe other externals.
  Choices:
     1 Use it instead of g_free randomly sometimes.
     2 Call it randomly sometimes.
     3 include it in external-only.c or object.c
     4 Mark it external only (breaks profiler).
     5 Use a .def file or Unix equivalent.

     5 is best, 2 is done here, the advantages/disadvantages
     among most choices are subtle. 3 is probably better than 2
     but is slightly bigger change, to put off -- you'd stop
     compiling mono-publib.c and move it to include/extra_redist.

     The advantage of not-.def file is perhaps that it is exposed
     by the compiler, so maybe easy to port and work with.
     People are more comfortable with obscure C extensions than
     any linker options, and there are multiple linkers to contend
     with. Arguably there are fewer compilers.
2019-08-16 15:24:30 -07:00
Egor Bogatov 6847508d2a Update llvm-jit.cpp 2019-08-17 00:25:19 +03:00
Jay Krell 16a81cf520 [Coop] Convert mono_attach_load_agent. (#15954)
Based on https://github.com/mono/mono/pull/15868.
Most cleanup and leak fixes moved and expanded to https://github.com/mono/mono/pull/15950.
2019-08-16 17:16:03 -04:00
Ryan Lucia 1e457cdd1e [netcore] Enable netcore resolution logic for mono_assembly_byname_lookup (#16256)
* Use netcore_load_reference in mono_assembly_request_byname

* Add ALC static Resolve event code from CoreCLR

* Wire up the AssemblyResolve event

* Enable newly passing test

* Set requesting assembly in InternalLoad

* Remove infinite recursion

* Only call netcore_load_reference from mono_assembly_request_byname

* Remove test completely
2019-08-16 16:54:47 -04:00
Jay Krell e54f03168d Ignore NULL in mono_marshal_free_dynamic_wrappers and mono_free_method. (#14150) 2019-08-16 09:33:04 -04:00
Jay Krell 66afab5803 Fill in more MONO_PATCH_INFO_NONE support. (#13990) 2019-08-16 09:32:48 -04:00
Jay Krell f52bfb94d5 [interp] Localize c, i32, o as suggested. (#16268)
This saves 16 stack bytes for clang, gcc is unmoved probably figured it out on its own.
2019-08-16 09:32:07 -04:00
Jay Krell 4d9e6ae20e [interp] Fix more MonoError reuse (mono_object_new_checked). (#16263)
* [interp] Fix more MonoError reuse (mono_object_new_checked).

* Inline mono_interp_new/mono_object_new_checked now that we are in outlined mono_interp_newobj.
2019-08-16 16:26:49 +03:00
Steve Pfister da2c0159e9 [corlib] Fix sharing mode validation rules (#16247)
Fixes https://github.com/mono/mono/issues/16032

When we switched to corefx File.Copy on unix, the behavior changed where it opened a source and destination stream in order to pass the safe handles to Interop.Sys.CopyFile. This exposed a flaw in our sharing validation rules in MonoIO.Open, which threw an exception in this scenario:

new FileStream("source.txt", FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite, 2048, FileOptions.DeleteOnClose);
new FileStream("source.txt", FileMode.Open, FileAccess.Read, FileShare.Read, 2048, FileOptions.None);

Simplified the FileShare check down to:

1. If the caller specifies FileShare.None, then it's an exclusive lock and no
   sharing is allowed.

2. If the caller specifies some other FileShare option, then FileShare.None
    cannot be specified.
2019-08-16 07:52:22 -04:00
Egor Bogatov 4dca4f6619 [netcore] Add patch-local-dotnet-aot-llvm rule (#16120)
* Add patch-local-dotnet-aot-llvm rule

* Update Makefile

* Add run-sample-local-dotnet-llvm
2019-08-16 12:43:08 +02:00
Jay Krell 0c637a73a9 intepreter: remove last element from various arrays (#16134)
add const
 combine lines for searchability
2019-08-16 11:37:20 +03:00
Jay Krell 35fc20b637 [interp] Fully outline enum_hasflag to save stack. (#16228)
Alternative to https://github.com/mono/mono/pull/16197.
If you are going outline, you sometimes might as well take it all with you
instead of bouncing back and forth for a partial inlining.
2019-08-16 10:13:22 +03:00
Zoltan Varga 5461fb78c7 Merge pull request #16261 from vargaz/tp-no-random
[runtime] Use a PRNG in the threadpool instead of the os random number generator.
2019-08-15 23:48:35 -04:00
Jo Shields b6c499631e Exclude Authenticode tests on Watch (#16278)
1002a4de2b added Authenticode cert support on non-WatchOS. The tests,
however, were not non-WatchOS-only. Fix this, so Watch doesn't try to
run Authenticode tests.
2019-08-15 22:07:18 -04:00
Zoltan Varga 764091677e Merge pull request #16257 from EgorBo/llvm-ptr
Align C# pointers with LLVM pointers for primitive types
2019-08-15 21:59:42 -04:00
Jay Krell 6c05cfab59 [mini] Cleanup alloca: call twice instead of once, and shrink allocation slightly. (#16158)
It is an actual function call at least on Windows.
2019-08-15 18:14:37 -04:00
Jay Krell b654aa1ca8 [interp] Fix more MonoError reuse. (#16262) 2019-08-16 00:06:50 +02:00
Jay Krell dfbf1a1bd3 [Coop] Convert emit_invoke_call. (#15964)
Removing calls to mono_string_new_checked.
Extracted from https://github.com/mono/mono/pull/15900.
2019-08-15 17:56:33 -04:00
Jay Krell 44ff0597b8 Wrap more external-only functions in GC mode transitions. (#15895)
mono_compile_method
mono_runtime_set_main_args
mono_runtime_run_main
mono_runtime_exec_managed_code
mono_load_remote_field
mono_load_remote_field_new
mono_store_remote_field
mono_store_remote_field_new
2019-08-15 17:48:18 -04:00
Zoltan Varga 870aec4aad Llvm optimizations (#16191)
* [jit] Disable inlining for ThrowHelper methods for non-netcore as well. Add an OP_NOT_REACHED after calls to these methods to let LLVM know they don't return.

* [llvm] Use the cold calling convention instead of the preserveall one, it has the same effect and its better supported.

* [llvm] Call the aot init function using the cold cconv.

* [llvm] Make the condition in the poll function unlikely.

* [llvm] Add a wrapper around the GC poll icall so it can be called with a cold calling convention.

* Move the noreturn check before the code which is shared with calli.
2019-08-15 21:46:00 +02:00
Stephen Toub 133bdb5fa2 Fix non-ASCII characters across corefx (dotnet/corefx#40318)
* Fix several non-visible characters in test files

* Replace Unicode surrogate pairs with escaped hex values

* Fix non-ASCII characters in most C# files

Signed-off-by: dotnet-bot <[email protected]>
2019-08-15 21:44:47 +02:00
Jo Shields 4ec4d7a3b3 Add missing FCONV_TO_U8 on ILP32 (WatchOS 5) (#16276) 2019-08-15 13:56:04 -04:00
Jay Krell 7b64f1cd00 Retain thread names as UTF8 instead of only UTF16. (#15945)
Windows can still have its Unicode thread names, since we have UTF16 initially, just don't retain it.

This does penalize ves_icall_System_Threading_Thread_GetName_internal (non-netcore only),
which has to convert back to UTF16 each time.

But seems like a net win overall.

There is also a little prep work here for constant thread names and some temporary measures as multiple changes head toward the same code.

Rename `mono_thread_set_name_internal` to `mono_thread_set_name`.
Close possible race conditions.

Extracted from https://github.com/mono/mono/pull/15859.
2019-08-15 19:37:34 +02:00
Jay Krell f35c755fea [interp] Outline newobj and newobj_vt. (#16267)
In this variation, the exception handling and resume are split between the main function and the helper function, and no address-taken occurs on ip/sp/vt_sp.

The order is a little tangled but convincing.
The helper function returns MonoException* or checks context->has_resume_state and then returns, and then the caller does the checks again.

Based on past analysis this will conserve stack, but that was not double checked here.
i.e. due to `&valuetype_this`, though it is conditional and the code could be split up into inline and outline.
2019-08-15 19:23:24 +02:00
Egor Bogatov 2f7a06d208 [netcore] Mark "Run Tests" step as failed if there are failures (#16230)
Currently "Run CoreFX tests" step is always green
2019-08-15 18:06:15 +02:00
Jo Shields dd6bd568a0 Fix failing OSX Android lane (#16274)
Linker order matters when using .a files, so zlib.a MUST come after
sgen.a if sgen.a was compiled with support for compressed ppdb
2019-08-15 10:37:04 -04:00
Vlad Brezae 6fc089bf8b [exceptions] Don't debug hang on ThreadAbortException (#16240)
It is pretty much useless.
2019-08-15 14:57:26 +03:00
Jay Krell 63e1828f7e Reduce redundant setting of thread name. (#16253)
Maintain a counter and only set if the counter has changed.
This cannot be fully thread safe, so is not.
Any thread can set any other thread name at any time.
You could be atomic to do better, and loop to do even better,
but the thread name could still be changed again right after the loop exists.

The previous code was also not reliable in this way, since again the name
could be changed right away.

#16248
2019-08-15 10:56:38 +02:00
Jay Krell 5ec452666a [interp] [wasm] p vs. o on newobj (#16264) 2019-08-15 10:42:11 +02:00
Jay Krell fd4956fbf2 [interp] Fix some, not all, of the error management. (#16232)
From #16190.
2019-08-15 10:41:49 +02:00
Jay Krell 7766f9b926 [interp] Short-circuit MINT_STELEM_REF on NULL. (#16229)
Presumably this is not a useful semantic change,
to skip those functions, given NULL.

(We will probably want to outline all of this also, later).
2019-08-15 10:39:45 +02:00
Jay Krell fc724e6cf0 [interp] Compute locals later to reduce register/stack pressure and conserve stack. (#16231)
i.e. do not def before a function call and use after, do both after.
2019-08-15 10:39:27 +02:00
Jay Krell dde3452690 [interp] Split leave into pieces, partially outlined, to conserve stack, (#16213)
but without changing how exception handling macros access labels and locals.

This saves 16 bytes of stack on Linux/amd64/gcc and likely similar everywhere,
as it takes an address-taken local out of interp_exec_method_full (stackval tmp_sp).

See
https://github.com/mono/mono/pull/16171
https://github.com/mono/mono/pull/16171/commits/a6a8f0d5ffa875da9cda63444e401c37810a690f for a
full outlining.
2019-08-15 10:39:03 +02:00
Nikolay Sivov 5b66d3d518 [cominterop] Fix copy-paste error in ComVisibleAttribute testing helper.
This type was introduced with 29a95bafd8.
2019-08-15 09:29:14 +02:00
Thays Grazia dcfec3966c Enable and document debug with sdb with netcore config. 2019-08-15 09:23:02 +02:00
Zoltan Varga 928aab1b84 [runtime] Use a PRNG in the threadpool instead of the os random number generator, its good enough, and its much faster. 2019-08-15 02:14:06 -04:00
Egor Bogatov 93eceec724 address feedback 2019-08-15 02:39:13 +03:00
Jay Krell 2463605f01 Remove ampersand from cfg->error per old agreement. (#16219) 2019-08-15 01:07:56 +02:00
Martin Baulig 934c4f4c87 X509CertificateImplBtls.PrivateKey should allow to actually set the key. (#16212)
The `X509CertificateImplBtls.PrivateKey` property setter was previously ignoring all values and always used `null`.  This should help with #16189.
2019-08-15 01:07:35 +02:00
Egor Bogatov ed4be03b79 handle primitive pointers in llvm 2019-08-15 01:38:58 +03:00
Vlad Brezae 4e793ad30c [interp] Fix icall signature (#16227) 2019-08-15 00:18:45 +03:00
Jo Shields f2d813c90d Fix linking of OS-provided zlib (#16177)
* Fix linking of OS-provided zlib

This is a reduced version of https://github.com/mono/mono/pull/16091
without the Z_PREFIX stuff

* Get rid of HAVE_ZLIB, be explicit about HAVE_SYS_ZLIB vs HAVE_STATIC_ZLIB

* Proposed fixes from Alex
2019-08-14 16:58:07 -04:00
Stephen Toub a103b78163 Delete dead _pauseTicks from TimerQueue (dotnet/coreclr#26160)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-14 21:19:04 +02:00
Jan Kotas e46b3efbd0 Undo readonly on _isLastFrameFromForeignExceptionStackTrace
This makes the field symmetric with other fields and fixes build break for CoreRT

Signed-off-by: dotnet-bot <[email protected]>
2019-08-14 21:19:04 +02:00
Aleksey Kliger (λgeek) ce92c4376f [metadata] Create strongly typed versions of mono_assembly_request_prepare (#16094)
* [metadata] Create strongly typed versions of mono_assembly_request_prepare

Addresses the family of issues similar to Coverity #1443346.

This came up as part of the Coverity review, and Coverity notices that this is
writting beyond the end of the structure.  While this is correct, this requires
that the idiom be properly followed - that is, that the structure being passed
is of the given size.

Replaced instead with a method that eliminates the room for error with methods
that will initialize the whole structure, and the actual size computation is
done inside the method with the proper type sizes.

While I used methods, I feel that this should use macros.
2019-08-14 15:07:26 -04:00
Aleksey Kliger (λgeek) a6b8494f0a (mono.1) Update the MONO_THREADS_SUSPEND description (#16236) 2019-08-14 19:23:36 +02:00
Egor Bogatov abb43f9361 ignore stacktrace tests 2019-08-14 14:33:44 +02:00
Jay Krell d1c0974e46 [interp] Reduce frame size by partially outlining load remote field. (#16196)
Extracted from https://github.com/mono/mono/pull/16171.
Ultimately over 100 bytes can be saved.

Tactically not outlined or indirected:
 vt_sp change
 ip advancement
 error handling

 Also partially fixes the error reuse from https://github.com/mono/mono/pull/16190.
2019-08-14 12:34:54 +02:00
Jay Krell 60ac98ee29 Make small_id_mutex not recursive. (#15485)
(Later non-recursive Windows mutexes should be SRWLOCK and only statically initialized.)
2019-08-14 12:33:58 +02:00
Jay Krell 8c5d0a790e Use ERROR_DECL. (#16220) 2019-08-14 12:28:00 +02:00
Jay Krell 74b0d01e07 [interp] Remove address-taking of vt_sp. (#16215)
Theoretically could help reduce frame size but it has not been seen to.
2019-08-14 12:27:22 +02:00
Zoltan Varga 4c71a3e892 [wasm] Disable running xunit test suites on wasm, its not working reliably yet. (#16223) 2019-08-14 12:26:31 +02:00
Jay Krell 4c17442dc3 [interp] Outline mono_interp_calli_nat_dynamic_pinvoke to reduce stack. (#16201)
Now that we have that function, also change from malloc to alloca.

This is part of #16171 and ultimately over 100 bytes were saved.
2019-08-14 12:25:44 +02:00
Jay Krell 136205ab45 Completely replace mono_error_ok with is_ok and make first external_only. (#16217) 2019-08-14 12:24:50 +02:00
Jay Krell 12de10007c Skip degenerate qsort: num < 2, size == 0, base == 0 (#16016)
Fixes https://github.com/mono/mono/issues/15994

Some is redundant for some qsort implementations.
2019-08-14 12:22:40 +02:00
Jay Krell 6873d5370d Fix warning LNK4221 warning in assembly-load-context.obj (#16004)
LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library
2019-08-14 12:19:08 +02:00
Jay Krell 9123ac0197 [interp] Outline get_virtual_method_fast to save 16 bytes of stack. (#16198)
Ultimately over 100 bytes are savable in a few steps.
2019-08-14 12:17:23 +02:00
Jay Krell dbf13301c8 [interp] Outline set_resume_state to conserve stack in main interpreter loop (#16200)
This is not intuitive but I definitely saw it.
2019-08-14 12:17:01 +02:00
Marek Safar 9ee80c6d3b Bump linker 2019-08-14 10:17:54 +02:00
Stephen Toub 3803a00421 Fix StyleCop warnings for rules enabled in corefx
Signed-off-by: dotnet-bot <[email protected]>
2019-08-14 10:15:38 +02:00
Thays Grazia f812d90fa1 [debugger] Debugger tries to execute a single step when the thread is already terminated (#16208)
* Debugger tries to execute a single step when the thread is already terminated.

* Fixing how to get thread tls.
2019-08-13 22:47:28 -03:00
Stephen Toub 50d3fc69d8 Convert several static readonly byte[]s to ReadOnlySpan<byte> (#26138)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-13 21:35:04 +02:00
Stephen Toub 9e13a7e097 Fix IDE1005 (simplify delegate invocation)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-13 21:35:04 +02:00
Stephen Toub db4441bfe7 Fix IDE0062 (make local functions static)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-13 21:35:04 +02:00
Stephen Toub 15ea431db7 Contribute to IDE0060 (unused argument)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-13 21:35:04 +02:00
Stephen Toub d927c98e03 Contribute to IDE0059 (unnecessary assignment)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-13 21:35:04 +02:00
Stephen Toub d82bc555c9 Contribute to IDE0019 (use pattern matching) and IDE0066 (use switch expression)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-13 21:35:04 +02:00
Stephen Toub e19d95b6de Contribute to IDE0044 (make field readonly)
I used the auto-fix and then undid changes in areas where the fields were potentially mutated in native, e.g. I undid many of the changes in reflection.  We can revisit those individually later.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-13 21:35:04 +02:00
Stephen Toub 6c95cbadf9 Fix StyleCop warning SA1400 (missing access modifiers)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-13 21:35:04 +02:00
Stephen Toub 0814b9de4d Enable StyleCop rules 1205, 1411, 1026, and 1000 (dotnet/corefx#40254)
* Fix StyleCop warning SA1411 (attribute ctor shouldn't use unnecessary parens)

* Fix StyleCop warning SA1026 (new[] spacing)

* Fix StyleCop warning SA1000 (consistent spacing around if, for, switch, etc.)

* Fix StyleCop warning SA1205 (partial elements should declare an access modifier)

Signed-off-by: dotnet-bot <[email protected]>
2019-08-13 21:35:04 +02:00
Egor Bogatov 6c51440538 auto-detect cpu in llvm jit 2019-08-13 22:24:54 +03:00
Aleksey Kliger (λgeek) 592de53a1f [runtime] Initialize thread suspend policy at startup, inline getter (#16149)
* [runtime] Initialize thread suspend policy at startup, inline getter

On some benchmarks we saw mono_threads_suspend_policy() using a lot of CPU
time.

Rather than doing an init-on-first-use, initialize the policy once upfront when
the JIT it starting up and make the getter method static inline.

* move mono_threads_suspend_policy_init into mono_thread_info_init

* [mini] Initialize suspend policy for `mono --version`

Need to initialize the suspend policy before printing its name.  Otherwise the
suspend policy is unset since no other runtime initialization is done for `--version`.
2019-08-13 15:16:05 -04:00
Alexander Köplinger ff77b427f4 [netcore] Cleanup System.Private.CoreLib.csproj (#16199)
- The eng/Versions.props was already imported by the arcade targets causing a double-import warning:

> warning MSB4011: "/Users/alexander/dev/mono/eng/Versions.props" cannot be imported again. It was already imported at "/Users/alexander/.nuget/packages/microsoft.dotnet.arcade.sdk/1.0.0-beta.19379.1/tools/DefaultVersions.props (17,3)". This is most likely a build authoring error. This subsequent import will be ignored.

- Remove BaseAddress and TRACE from the project file, this was done upstream at https://github.com/dotnet/coreclr/commit/bc430cdd2010bf7790854a60380d00c506c346a6

- Remove unecessary DebugSymbols/DebugType settings, we already set them in the global PropertyGroup
2019-08-13 16:41:03 +02:00
Aleksey Kliger (λgeek) 1f4ac5d767 [sre] Outline typebuilder_setup_fields loop body (#16184)
The loop body uses coop handles, so wrap it in HANDLE_FUNCTION_ENTER/HANDLE_FUNCTION_RETURN
2019-08-13 09:31:31 -04:00
Jay Krell ef199425a2 [interp] Replace mono_error_ok with is_ok. (#16193)
The locally unknown function, despite being small/fast, forces saving values in stack and nonvolatile registers
around calling it.
Both nonvolatile registers and stack are at a premium here, whereas usually stack is cheap.
The macro is just a read from offset 0 and checking for zero.
2019-08-13 15:30:28 +02:00
Alexander Köplinger b60aaea791 [pkg] Bump libgdiplus to 6.0.2 2019-08-13 12:12:22 +02:00
Egor Bogatov c36f0a126e [netcore] decimal should have alignment=8 (#15666)
* Fix System.Runtime.InteropServices tests

* Update marshal.c

* Update marshal.c

* Update marshal.c
2019-08-12 21:57:47 +02:00
Zoltan Varga 5bc4944bf0 Merge pull request #16151 from spouliot/ios-intr-enable-sre
[sdk] Enable the SRE runtime code inside iOS builds
2019-08-12 14:44:54 -04:00
Stephen Toub b25395bde3 Re-enable StyleCop warning SA1400 (elements should specify access) (#40240)
One of the more common things we "nit" in PRs.  Now the compiler will flag it for us.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-12 19:46:54 +02:00
Aaron Robinson 66f7436d6f Remove unnecessary error check for QueryUnbiasedInterruptTime call (#26120)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-12 19:46:54 +02:00
Stephen Toub 4f821c3e8d Enable FxCop and StyleCop analyzers (dotnet/coreclr#26100)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-12 19:46:54 +02:00
Aleksey Kliger (λgeek) ad64c781eb [interp] Fix stub_get_resume_state write to out parameter (#16145)
Addresses Coverity CID 1452245
2019-08-12 13:09:59 -04:00
Ryan Lucia cadd114f64 [netcore] Pass MONO_ASMCTX_LOADFROM on LoadFrom calls (#16075) 2019-08-12 11:46:12 -04:00
Ankit Jain c028454bef [msbuild] Bump to track xplat-master and update roslyn (#16155)
Prompted by mono/msbuild#126:

This includes:

- merge mono-2019-06
- SDK update to track dotnet release/3.0.100-preview8
- Roslyn updated to 3.3.0-beta2-19381-14
2019-08-12 17:03:13 +02:00
UnknownShadow200 69ebdd8b93 [WinForms] Fix NotifyIcon not showing in systray on 64bit linux (#16164)
https://bugzilla.xamarin.com/show_bug.cgi?id=14976

Credit goes to datnhanlz for noting that removing XChangeProperty(DisplayHandle, hwnd.whole_window, _XEMBED_INFO, _XEMBED_INFO, 32, PropertyMode.Replace, atoms, 2); would also fix the bug. 

Note that the type of Atom is actually unsigned long (see usr/include/X11/X.h), however the code used a C# int for the atoms. As such the code worked without a problem on 32 bit linux, but broke on 64 bit linux.

I switched to using IntPtr instead to make the code also work on 64-bit.
2019-08-12 16:09:08 +02:00
Aleksey Kliger (λgeek) dd3f6e0d31 [debugger] Cleanup MonoError on in isFixedSizeArray (#16146)
Cleanup MonoError on error paths.  Also change `return FALSE` to `return 0`.

Addresses Coverity CID 1452205
2019-08-12 09:50:58 -04:00
Nikolay Sivov 612e0644b6 [mono] Fix some compiler warnings (#16159)
* [mini] Remove unused variables.

* [mini] Remove unused function.

Single call site is conditionally compiled.

* [sgen] Remove unused variable.

* [utils] Fix misleading indentation warnings.
2019-08-12 12:42:59 +02:00
Nikolay Sivov f9052ed78e [System.Drawing] Use CoreFX implementation of BufferedGraphics on Windows (#16163)
The issue was made visible with .NET Core WinForms. Some controls draw text with DrawTextEx to intermediate Graphics based on Bitmap, that later it's moved back to main Graphics with DrawImage. This results in a lost of transparency component along the way, making antialiased glyph bitmaps draw and B/W. Corruption is visible with gray antialiasing, but is more severe in subpixel modes.

I verified that same happens with gdiplus on Windows, code from CoreFX works correctly.
2019-08-12 12:42:07 +02:00
Jay Krell c70b4cc3cc [remoting+interp] [remoting+debugger] Fix use of dangling local. (#16173) 2019-08-12 12:35:30 +02:00
Jay Krell 4e5544f02d [interp] Remove unnecessary loops, that optimizer might handle. (#16169) 2019-08-12 12:34:46 +02:00
Vincent Povirk 7413bb84ec [w32process-win32] Don't duplicate CreateProcess search logic. (#16156)
When given a null application name, CreateProcess already
searches the path and appends .exe in some cases. .NET's
Process class behaves in the same way (see
https://github.com/mono/mono/pull/16089#issuecomment-519984244).

The duplicated logic is unnecessary and broken in several ways.
Failures are ignored and the command line arguments are
executed. Relative paths are expected not to end in "exe".
Many corner cases work differently from .NET and CreateProcess.

This change makes it impossible for process_complete_path to fail,
so I removed the gboolean return and pulled out the output
parameter. Its caller wasn't handling the return value correctly
anyway.
2019-08-12 12:05:05 +02:00
Zoltan Varga 835282004c Merge pull request #16136 from EgorBo/fix-inlining
[netcore] Fix inlining
2019-08-11 22:32:01 -04:00
Zoltan Varga 7c511c9937 Merge pull request #16160 from vargaz/wasm-xunit-4
[wasm] Xunit testing work.
2019-08-10 22:56:05 -04:00
Alexander Köplinger ec73f9ba17 Bump corefx to fix build break 2019-08-10 23:45:11 +02:00
Zoltan Varga c6054d5aa1 [wasm] Run System.Core xunit tests on CI. 2019-08-10 15:18:26 -04:00
Zoltan Varga 95b705d8c1 [wasm] Add argument conversions to the xunit runner. 2019-08-10 15:18:26 -04:00
Alexander Köplinger 738b6988b5 Bump corefx to get https://github.com/mono/corefx/pull/327 2019-08-10 16:19:01 +02:00
Nikita Voronchev 000430002a [System.Drawing.Design] Allow context be a null in the ColorEditor.EditValue (#16141)
If one call `ColorEditor.EditValue(IServiceProvider, Object)` ([MSDN](https://docs.microsoft.com/ru-ru/dotnet/api/system.drawing.design.uitypeeditor.editvalue?view=netframework-4.8#System_Drawing_Design_UITypeEditor_EditValue_System_IServiceProvider_System_Object_)), then `context` is `null` and drop-down menu doesn't appear.
2019-08-10 16:01:37 +02:00
Sebastien Pouliot 360c1c44c7 [sdk] Enable the SRE runtime code inside iOS builds
This will allow the interpreter to use System.Reflection.Emit.

Note: There is a small size increase (about 50kb) for an application
built in release mode with the LLVM backend (even if the interpreter
is now used).
2019-08-09 13:57:54 -04:00
Vlad Brezae b52830cf11 [interp] Fix overflow of execution stack (#16115)
We were not tracking max_stack_height for a few opcodes.
2019-08-09 20:28:30 +03:00
Zoltan Varga 54c07051a8 Merge pull request #16139 from steveisok/run-single-ios-sdk-test
Added the option to run a single test in the iOS SDK
2019-08-09 12:58:01 -04:00
Ryan Lucia a1bb37cd52 [netcore] Make mono_assembly_request_prepare take an ALC (#16061)
* Make mono_assembly_request_prepare take an ALC

* Typo

* Fix pedump

* Use default ALC

* Make v1 preload hook external-only

* Convert pedump and monodis

* fixup: use default ALC in netcore preload hook

trusted platform assemblies should be loaded into the default ALC
2019-08-09 11:44:50 -04:00
Alexander Köplinger 0970996f75 Bump eng/Versions.props again
Try to fix the netcore build.
2019-08-09 17:03:12 +02:00
Alexander Köplinger 75c21692a0 Add mono-hang-watchdog.in to tarball
Remove custom distdir target and use standard EXTRA_DIST to do so.
2019-08-09 16:48:16 +02:00
Stephen Toub 86a0ad2f88 Fix FxCop warning CA1823 (unused fields)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Stephen Toub f39ac1d32d Fix FxCop warning CA2229 (private deserialization ctor)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Stephen Toub 2d3a6ea2bb Fix FxCop warning CA1825 (Array.Empty)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Stephen Toub cce1583769 Fix StyleCop warning SA1620 (generic XML comment ordering)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Stephen Toub 15963fe836 Fix StyleCop warning SA1617 (void return XML comment)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Stephen Toub 4ce53c845b Fix StyleCop warning SA1113 (comma position for parameters)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Stephen Toub 442e9ad144 Fix StyleCop warning SA1206 (modifer ordering)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Stephen Toub 01fa50943f Fix StyleCop warning SA1121 (use built-in types)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Stephen Toub 9c3037fc59 Fix StyleCop warning SA1200 (cref prefixes)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Stephen Toub 1fcf7a1ab4 Fix StyleCop warnings SA1028 and SA1518 (trailing whitespace and blank lines)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Stephen Toub 441257339f Fix FxCop warning CA1018 (attributes should have AttributeUsage)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 16:23:42 +02:00
Alexander Köplinger 74338e0f2d Bump corefx to get https://github.com/mono/corefx/pull/323 2019-08-09 16:21:12 +02:00
Alexander Köplinger 09e7c4509c Update dependencies from corefx (#16137) 2019-08-09 15:19:16 +02:00
Steve Pfister 9e9697c978 Added the option to run a single test in the iOS SDK 2019-08-09 09:10:13 -04:00
Alexander Köplinger f15fe47075 [build] Remove ILDISASM variable from platform Makefiles
It was written by configure.ac to config.make and is unused anyway.
2019-08-09 12:53:14 +02:00
Alexander Köplinger 652f6c64b6 [build] Remove PLATFORM_CORLIB from platform Makefiles
Changing the corlib assembly name isn't supported anywhere else in the build.
2019-08-09 12:53:14 +02:00
Alexander Köplinger e80f3449da [build] Remove MBAS from the platform Makefiles
It no longer exists.
2019-08-09 12:53:14 +02:00
Alexander Köplinger 8697b31082 [build] Remove EXTERNAL_MCS setting in platform Makefiles
Setting an explicit mcs is no longer supported by the rest of the build scripts.
2019-08-09 12:53:14 +02:00
Alexander Köplinger d7174c9aa6 [build] Remove confusing commented out code 2019-08-09 12:53:14 +02:00
Alexander Köplinger ab1d61509d [build] Remove PLATFORM_MAKE_CORLIB_CMP
The corlib_cmp doesn't exist anymore.
2019-08-09 12:53:14 +02:00
Alexander Köplinger 3e77e01071 [build] Replace PLATFORM_ ifdefs with HOST_PLATFORM checks
Building Linux BCL assemblies from a macOS machine didn't work since we
were enabling some Apple features if the build machine was macOS.
2019-08-09 12:53:14 +02:00
Alexander Köplinger 175e345122 [tools] Add .gitignore for mono-hang-watchdog 2019-08-09 12:39:34 +02:00
Stephen Toub 67a89b3a6f Move CodeAnalysis.ruleset to shared (dotnet/corefx#40153)
So that the same settings can be applied to corelib.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 12:30:05 +02:00
Egor Bogatov a7e428d82f fix inlining 2019-08-09 12:55:50 +03:00
Egor Bogatov 7deb53514d Make System.Runtime.Intrinsics.X86.*.IsSupported intrinsic 2019-08-09 09:34:29 +02:00
Egor Bogatov 9442ed95d7 fix minor issues 2019-08-09 09:34:29 +02:00
Alexis Christoforides 2c4b60fe24 [merp] Use a separate program as the hang supervisor. (#15715)
* [merp] Use a separate program as the hang supervisor.

Fixes https://github.com/mono/mono/issues/15646

macOS does not like signals being sent from the forked supervisor process, possibly towards anywhere but definitely when sent to the parent process. The following message is currently spewed after the supervisor process attempting to send a SIGSEGV to a hanged Mono process:
"The process has forked and you cannot use this CoreFoundation functionality safely. You MUST exec()."

We follow that direction and introduce a new binary that, when available in the mono executable's binary directory, is used to abort the parent process for us.
2019-08-09 10:31:57 +03:00
Ryan Lucia 6a459c25d7 [netcore] Don't return REFERENCE_MISSING in netcore_load_reference 2019-08-09 09:23:10 +02:00
Jeffrey Zhao a49ecebd4e Catch InvalidCastException properly in Collection (dotnet/coreclr#25953)
The explicit implementations of IList.Add/Insert/Set methods catch
InvalidCastException for casting input argument to type T to throw
an ArgumentException. The issue here is they put the core collection
modification operation in the try block, which could be overridden
by sub-classes and produce an InvalidCastException from user logic,
even the argument passed to IList.Add/Insert/Set is valid.

To fix the issue, we just need to move the collection modification
outside the try block, and leave the casting in try block only. In
this way, we'll get an ArgumentException when the argument type is
invalid, but propagate the InvalidCastException thrown from user
code as it should be.

dotnet/corefx#39919

Signed-off-by: dotnet-bot <[email protected]>
2019-08-09 09:22:28 +02:00
Zoltan Varga e71604d695 Merge pull request #16125 from vargaz/wasm-keep-config-cache
[wasm] Add a KEEP_CONFIG_CACHE option to Make.config to avoid deleting the autoconf cache file on make clean.
2019-08-09 03:20:03 -04:00
monojenkins 1369ebcfaf [bcl] Update BCL Linked Size 2019-08-09 09:19:32 +02:00
Alexander Köplinger fde0a5b628 [ci] Trigger PR builds for netcore only on master branch
The work is happening in master only for now.
2019-08-09 00:53:19 +02:00
Alexander Köplinger 6075417d88 Bump corefx so it points to correct branch 2019-08-09 00:14:18 +02:00
Alexander Köplinger ec35e14636 [tests] Fix accessing field of MarshalByRefObject in remoting1.cs (#16119)
We need to copy it to a local variable first.
This was exposed by a new Roslyn optimization for String.Concat (see https://github.com/dotnet/roslyn/issues/37830).
2019-08-09 00:07:41 +02:00
Stephen Toub da2c1cde97 Re-enable StyleCop warnings SA1028 and SA1518 (trailing whitespace and blank lines) (#40113)
Mechanical/automated change.  The only manual changes were a) removing the two rules from the CodeAnalysis.ruleset file, b) removing spaces from one line of a .targets file that is used to generate a .cs file, and c) reverting the changes in a few test files where the naive replacement happened in the middle of a verbatim string where the whitespace actually mattered.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-08 23:44:46 +02:00
Alexis Christoforides 1127974861 [System] Guard against attempting to creating out-of-range spans in macOS FileSystemWatcher 2019-08-09 00:24:06 +03:00
Zoltan Varga adeef6c0fc [wasm] Add a KEEP_CONFIG_CACHE option to Make.config to avoid deleting the autoconf cache file on make clean. 2019-08-08 17:08:51 -04:00
Aleksey Kliger (λgeek) 36af44e3be [perfcounter] Define mono_perfcounter_foreach even if perfcounters are disabled. (#16100)
Fixes netcore build on win32
2019-08-08 14:06:21 -04:00
monojenkins 18917b885c [csproj] Update project files 2019-08-08 19:10:03 +02:00
Marek Safar 2ef50f54ee Bump corefx for #15259 fix 2019-08-08 19:10:03 +02:00
Adam Sitnik b15518dd5e make DateTime.UtcNow 5% faster to minimize the leap second performance impact (#26046)
* make few methods used by DateTime.UtcNow inlinable to minimize the leap second performance regression impact, related to #25728

* apply suggested micro-optimizations

Signed-off-by: dotnet-bot <[email protected]>
2019-08-08 18:55:19 +02:00
Jan Kotas 7c59cd14fe Cleanup ProjectN ifdefs (dotnet/corert#7675)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-08 18:55:19 +02:00
Alexander Köplinger dfa5a6ce4d [aprofutil] Install the tool correctly (#16112)
It needed a few tweaks to be usable when Mono is installed to the prefix.
2019-08-08 16:46:55 +02:00
Steve Pfister 64ea10fbcd Fixed RuntimeType.GetConstructorCandidates("") to return 0 elements. (#16054)
https://github.com/mono/mono/issues/16010

The current behavior for GetConstructorCandidates when the name is null, "",
or "*" is to return the set of constructors for the type. For "", .NET Core and
.NET Framework return 0 elements.  This PR adds a check for "" to match that
behavior.
2019-08-08 12:14:39 +02:00
Stephen Toub c189afd4f5 Delete PROJECTN ifdefs from Corelib (dotnet/coreclr#26058)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-08 10:10:47 +02:00
Sung Yoon Whang 240202cd90 Improve ArgumentNullExceptions on DiagnosticCounter.DisplayName/Unit (#26035)
Signed-off-by: dotnet-bot <[email protected]>
2019-08-08 10:10:47 +02:00
monojenkins 53b9c88795 [bcl] Update BCL Linked Size 2019-08-08 10:09:17 +02:00
imhameed fc4d234ef6 [sdb][interp] Use the interpreter's resume state to compute the IL offset in compute_frame_info. (#15936)
[sdb][interp] Use the interpreter's resume state to compute the IL offset in compute_frame_info.

This recovers the relevant bits of the "resume state" from the interpreter and uses that to recalculate the `il_offset` for the top frame.

Fixes https://github.com/mono/mono/issues/15687.
2019-08-07 20:05:55 -04:00
imhameed 4462f10fb6 [llvm] Explicitly check for errors when calling LegacyIRCompileLayer::addModule. (#16082)
[llvm] Explicitly check for errors when calling LegacyIRCompileLayer::addModule.

LLVM built with LLVM_ENABLE_ASSERTIONS=On will crash if errors are not
explicitly consumed.
2019-08-07 15:15:55 -04:00
Ryan Lucia aece3efc99 Relax locking (#15986)
* Remove usage of loader lock

Originally added in https://github.com/mono/mono/commit/c4cbd3b700eea52c84c68c9450d80357b3be681d but no longer relevant

* Make get_agent_domain_info lock-free and relax loader lock

* Syntax errors

* Undo first commit, other than the commit message

* Fixes
2019-08-07 14:17:19 -04:00
Marek Safar b3344fa0b2 Bump linker (#16014)
* Bump linker

* Bump api-doc-tools and add NEW_CECIL define to mdoc

* Bump linker

* Bump API snapshot submodule

* [csproj] Update project files
2019-08-07 19:37:19 +02:00
Sylvain 4780486237 Memcpy instead of memcpy1 in System.Buffer.MemoryCopy (void*, void*, long, long). (#16056)
In the same way it is done in System.Buffer.MemoryCopy (void*, void*, ulong, ulong).

Correct what appears to be a typo in System.MemoryCopy with "long, long" size arguments.

Consequently, copy is not done byte per byte for the last int.MaxValue bytes when MemoryCopy is called with long argument (most common case). This should provide noticeable performance increase.
2019-08-07 18:36:47 +02:00
Radek Doulik 1f2b37ed37 [aotprof-tool] Initial import of AOT profiler tool (#15384)
* [aotprof-tool] Initial import

Imported https://github.com/radekdoulik/aotprofile-tool and updated it
to use Mono.Profiler.Log

* [aotprof-tool] Added man page

* [aotprof-tool] Use the shortened name in README.md
2019-08-07 18:24:51 +02:00
Ryan Lucia dcd5715161 [netcore] Re-enable IsAssignableFrom test
This was fixed a while back but never removed from the exclusions
2019-08-07 17:27:35 +02:00
Zoltan Varga d18daefdbc Merge pull request #16085 from kjpou1/wasm-sdk-v0.2.0
[wasm][sdk] Bump SDK Version 0.2.0
2019-08-07 11:17:12 -04:00
Jay Krell e8d28feb1e There is no need to zero static data, and it is racy (#15699)
if there are multiple threads calling (unlikely).
This zeroing was made moot by 470354fa81 January 2019.
2019-08-07 10:40:57 -04:00
Thays Grazia e690fb0240 Allow generating DIM bitcode (#16070) 2019-08-07 11:06:56 -03:00
Kenneth Pouncey 4767c581c7 Update sdk version for tests 2019-08-07 15:57:45 +02:00
Alexander Köplinger 521d4c8395 [utils] Move MAP_ANONYMOUS check after sys/mman.h import
The flag is defined in that header on OSX. Followup to 2abe569ede
2019-08-07 15:54:09 +02:00
Aleksey Kliger (λgeek) aea457cdb3 [w32socket] Translate ELOOP and ENAMETOOLONG (#16039)
Translate to WSAELOOP and WSAENAMETOOLONG, respectively.

See https://docs.microsoft.com/en-us/windows/win32/winsock/windows-sockets-error-codes-2

Addresses part of https://github.com/mono/mono/issues/16024
2019-08-07 09:42:39 -04:00
Nikolay Sivov 10c5e6407e [trace] Improve enter/leave output formatting (#16036)
* [trace] Use specific integer types for return value traces.

* [trace] Improve argument list formatting for ENTER lines.

Return value changes are especially visible for bools, where currently 4 bytes integers are printed.
2019-08-07 15:05:44 +02:00
Kenneth Pouncey b0611a5ee9 Bump SDK Version 0.2.0 2019-08-07 14:59:53 +02:00
Nikolay Sivov d34381f72e [win32] Fix some compilation warnings (#15956)
* [mini] Remove unused variable.

* [mini] Mark win32 exception handling functions static.

* [mini] Remove unused variable.

* [mini] Suppress unused function warning.

* [metadata] Fix unused function warning for Win32 build.
2019-08-07 14:45:19 +02:00
iamphi 2abe569ede Fix compilation on OSX 10.9 (#14411)
Found solution from: 
https://github.com/eclipse/omr/issues/902#issuecomment-288559044
2019-08-07 14:42:57 +02:00
Alex Thibodeau 24bbb94b6b Swap bytes for tcp port number because windows API gives us port in network order. (#16030)
Addresses the FIXME in Win32IPGlobalProperties.cs :: FillTcpTable

Fixed Unity issue: issuetracker.unity3d.com/issues/ipglobalproperties-dot-getactivetcpconnections-return-different-port-numbers-when-compared-to-cli-netstat-a-output
2019-08-07 14:30:07 +02:00
Zoltan Varga ba1c949a24 [runtime] Fix an autoconf warning. (#16078)
[runtime] Fix an autoconf warning.

<!--
Thank you for your Pull Request!

If you are new to contributing to Mono, please try to do your best at conforming to our coding guidelines http://www.mono-project.com/community/contributing/coding-guidelines/ but don't worry if you get something wrong. One of the project members will help you to get things landed.

Does your pull request fix any of the existing issues? Please use the following format: Fixes #issue-number
-->
2019-08-07 06:06:00 -04:00
Vlad Brezae e702e8286f [interp] Fix DEBUG_INTERP build (#16057) 2019-08-07 12:47:41 +03:00
Marek Safar 25b84915e1 Remove code moved to shared partition 2019-08-07 09:48:03 +02:00
Stephen Toub c5027781de Remove some unused locals (dotnet/corefx#39956)
* Remove some unused locals

Trying out various analyzers, including one to flag unused locals.  There are more than this, but this is a first batch.  Some of these are just clean-up.  Others are saving unnecessary cost.  At least one appears to be a real functional bug.

* Address PR feedback

Signed-off-by: dotnet-bot <[email protected]>
2019-08-07 09:48:03 +02:00
Stephen Toub 824351f49c Fix CounterGroup to use built-in types
Signed-off-by: dotnet-bot <[email protected]>
2019-08-07 09:48:03 +02:00
Aleksey Kliger (λgeek) b2ab9198d3 Move AssemblyLoadContext VM-invoked resolve methods to shared (#25989)
Share between CoreCLR and Mono

Mono began using a copy of these methods with
https://github.com/mono/mono/pull/15946

Signed-off-by: dotnet-bot <[email protected]>
2019-08-07 09:48:03 +02:00
Tanner Gooding 0378116ffc Updating Math.Round and MathF.Round to be IEEE compliant so that the intrinsic and managed form are deterministic. (#25901)
* Updating Math.Round and MathF.Round to be IEEE compliant so that the intrinsic and managed form are deterministic.

* Fixing the Math.Round and MathF.Round handling for values greater than 0.5 and less than 1.0

* Applying formatting patch.

Signed-off-by: dotnet-bot <[email protected]>
2019-08-07 09:48:03 +02:00
John SalemandNoah Falk a76f6fa9b5 Allow for interface implementations in EventSource.WriteEventVarArgs (#25844)
* Allow for interface implementations in EventSource.WriteEventVarArgs

* Also account null ref types and nullable types

* fix error in comment and simplify first part of boolean logic

* Update src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/EventSource.cs

Co-Authored-By: Noah Falk <[email protected]>

Signed-off-by: dotnet-bot <[email protected]>
2019-08-07 09:48:03 +02:00
Ryan Lucia 022fc4ea37 [netcore] Set flag for processor arch when parsing assembly names 2019-08-07 09:22:04 +02:00
Bernhard Urban fe0f311a84 [arm] respect I1 and I2 on gsharedvt out transition (#16000)
[arm] respect I1 and I2 on gsharedvt out transition

In order to trigger the problem, we must call into gsharedvt code ("in" transition) and then escape the gsharedvt world ("out" transition). The bug happens in the latter. Also some other stars need to align (I haven't fully understood it), thus the repro is quite long.

The provided repro only triggers with LLVM, which we don't have enabled on CI yet: https://github.com/mono/mono/issues/15999

Fixes https://github.com/mono/mono/issues/15261
Fixes https://github.com/mono/mono/issues/15262
Fixes https://github.com/mono/mono/issues/15263
Fixes https://github.com/mono/mono/issues/15307
2019-08-06 18:25:51 -04:00
Zoltan Varga add830f9cb Merge pull request #16071 from vargaz/wasm-xunit-3
[wasm] More xunit fixes.
2019-08-06 17:57:22 -04:00
Zoltan Varga 476af240d2 [wasm] Compile interp.c with -mllvm -join-liveintervals=false to fix compilation times. 2019-08-06 16:46:19 -05:00
Jay Krell 9bf703b031 [Coop] Convert mono_object_isinst_icall. (#15963) 2019-08-06 15:26:55 -04:00
Zoltan Varga 59a285a546 [wasm] More xunit fixes. 2019-08-06 15:24:32 -04:00
coypoop 5a4283d1b3 Update NetBSD support (#15938)
Based on the FreeBSD variation.
Needs some additional changes I'm still ironing out.
2019-08-06 20:32:38 +02:00
Ryan Lucia 64bf7ef9db [netcore] Update test exclusions to reflect ALC work (#16059) 2019-08-06 14:08:18 -04:00
Zoltan Varga 3c88e9f251 [netcore] Avoid calling load hooks during AOT.
Fixes https://github.com/mono/mono/issues/16046.
2019-08-06 19:40:23 +02:00
Zoltan Varga 662b72f913 Merge pull request #16058 from vargaz/wasm-requests-2
[wasm] Update WASM-REQUESTS.md.
2019-08-06 12:53:44 -04:00
Zoltan Varga dda05d0a09 [wasm] Update WASM-REQUESTS.md. 2019-08-06 10:48:42 -04:00
Egor Bogatov 0fbc5d8315 DeflateStream: check IsInvalid before disposing (#16048) 2019-08-06 14:53:24 +02:00
Ryan Lucia 85296ef1be [netcore] Make the load hook ALC-aware (#16012)
The meat of this PR is what the title suggests, and with this commit all the basic ALC functionality should be working properly. Probably worth checking if this makes any new tests pass.

Additionally, this PR includes a second commit that switches over the search hook to use loaded_assemblies from the ALCs. This may break some existing tests due to remaining unimplemented ALC behavior, notably the native loading mechanism needed for Openssl in some of the cryptography tests. My inclination is to include the commit regardless and just disable the failing tests so that any future ALC work can watch for regressions in the loader, but I would appreciate input from steveisok on how important those tests are. I've not disabled anything yet in order to see exactly what new failures are introduced.
2019-08-06 12:16:15 +02:00
Jay Krell 474092add6 UWP now allows LoadLibrary. (#16015) 2019-08-06 12:14:38 +02:00
Martin Baulig 1c13b30225 SocketAsyncEventArgs cleanups and preparations for the real thing. (#16001)
Cleaning up the `SocketAsyncEventArgs` class and preparing it for it's eventual
adaption from CoreFX.

There are a few instance fields and property accessors with `internal` visibility,
which the CoreFX version does not have.  Replaced these with accessor methods.

The `PolicyRestricted` property and it's related `SocketAsyncEventArgs (bool)`
constructor is not used anywhere and the CoreFX version has a constructor with the
same signature, but different semantics.

In the CoreFX version, `Complete ()` does not call `DoComplete (this)` - renamed it
into `Complete_internal ()` to avoid any ambiguities and help the transitioning.
2019-08-06 12:13:40 +02:00
Alexander Köplinger 7ab3811b93 Bump api-doc-tools to latest master (#16035)
* Bump api-doc-tools to latest master

Disable building mdoc.exe in mcs mode since it no longer builds because of new C# features.

* Fix mcs build by disabling more mdoc invocations

* Bump monodroid_tools to compile against v4.7 reference assemblies

mdoc needs ValueTuple which is not in v4.6.

* [csproj] Update project files
2019-08-06 10:40:24 +02:00
Zoltan Varga d57f3f55f0 Merge pull request #16043 from kjpou1/wasm-sdk-small-fix
[wasm][sdk] Fix misspelling and trailing comma
2019-08-06 02:29:20 -04:00
Kenneth Pouncey ca51e5b5cc Fix misspelling and trailing comma 2019-08-06 07:30:47 +02:00
Zoltan Varga 9b4bc613e4 Merge pull request #16006 from vargaz/as-gsharedvt
[jit] Avoid asserting on Unsafe.As<T> in gsharedvt methods.
2019-08-05 21:04:44 -04:00
Kenneth Pouncey 69aa5dcaa7 Fix indentation 2019-08-05 15:03:08 -05:00
Kenneth Pouncey 357a3aaec5 [wasm][sdk] Fix issue with WasmLinkAssemblies task wrongly using reference assemblies
The issue is that when executing the `WasmLinkAssemblies` task the reference assemblies are currently used as input to the linker step and output in the published application instead of the actual framework library file.

My findings so far on this is that the package references are resolved in the MSBuild [ResolvePackageAssets](https://github.com/dotnet/sdk/blob/master/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs#L205.)

Those are then remapped from [here](https://github.com/dotnet/sdk/blob/ec9f5fc673f798dd6a89c7d11a4e62727837757c/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets#L270) to the `RuntimeCopyLocalItems`.

What I did was pass the `RuntimeCopyLocalItems` to the `WasmLinkAssemblies` task and do a remap to the runtime versions.  This works against everything I have thrown at it so far.

Of course this could fail if the nuget has somehow set `copy to local` false maybe but I do not see anything in the code referenced above checking for that.
2019-08-05 15:03:08 -05:00
Jo Shields c8c52f7e9f Bump version to 6.7 (#16031)
* Bump version to 6.7
2019-08-05 15:31:47 -04:00
Alexander Köplinger 807e4b3d6f [ci] Disable 32bit llvm sdks build
It was removed in https://github.com/mono/mono/commit/a6e6c72c8fc3702db37e1572694a49902f63195f
2019-08-05 21:29:51 +02:00
Kenneth Pouncey ac80d041e6 [wasm][sdk] Decoupling the WebAssembly runtime debug and release versions. (#16028)
* Update templates

- Add PropertyGroups for Debug and Release to set the DebugSymbols and DebugType by default.

* Allow the selection of the WebAssembly runtime version Debug | Release

- Decouple the reliance on `_DebugSymbolsProduced` to decide which runtime version to publish.
- Add support for <MonoWasmRuntime>Debug | Release</MonoWasmRuntime>
- Add validation target of the property to Mono.WebAssembly.Build.targets.

* Indentation
2019-08-05 19:03:35 +02:00
Zoltan Varga 93a6bc3151 [netcore] ifdef out unused icalls/files. (#16009)
* [netcore] ifdef out unused icalls/files.

* Add MONO_EMPTY_SOURCE_FILE.
2019-08-05 17:13:40 +02:00
Zoltan Varga 60bfa99043 [jit] Avoid asserting on Unsafe.As<T> in gsharedvt methods.
Fixes https://github.com/mono/mono/issues/15992.
2019-08-03 15:06:58 -04:00
1057 changed files with 15720 additions and 20259 deletions

No files matched your search

+3
View File
@@ -1,3 +1,6 @@
# diff settings
*.cs diff=csharp
# ensure LF endings on all checkouts
configure.ac crlf=input
config.rpath crlf=input
+1 -1
View File
@@ -48,7 +48,7 @@ EXTRA_DIST= \
external \
mcs/class/referencesource
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_RUNTIME=false
# Distribute the 'mcs' tree too
GIT_DIR ?= $(srcdir)/.git
+1 -1
View File
@@ -2,7 +2,7 @@
{
"name": "roslyn",
"url": "git://github.com/mono/roslyn.git",
"rev": "6bfcd4e770609a38b8523e83ce1ec943162f30bb",
"rev": "7a840bd5697ef6ea41f554a09d837636fba9d88d",
"remote-branch": "origin/mono-testing",
"branch": "mono-testing",
"directory": "roslyn"
+18 -36
View File
@@ -4014,42 +4014,24 @@ Global
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|net_4_x.Build.0 = Debug|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|net_4_x.ActiveCfg = Release|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|net_4_x.Build.0 = Release|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monodroid.ActiveCfg = Debug|monodroid
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monodroid.Build.0 = Debug|monodroid
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monodroid.ActiveCfg = Release|monodroid
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monodroid.Build.0 = Release|monodroid
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monotouch.ActiveCfg = Debug|monotouch
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monotouch.Build.0 = Debug|monotouch
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monotouch.ActiveCfg = Release|monotouch
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monotouch.Build.0 = Release|monotouch
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monotouch_tv.ActiveCfg = Debug|monotouch_tv
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monotouch_tv.Build.0 = Debug|monotouch_tv
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monotouch_tv.ActiveCfg = Release|monotouch_tv
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monotouch_tv.Build.0 = Release|monotouch_tv
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monotouch_watch.ActiveCfg = Debug|monotouch_watch
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monotouch_watch.Build.0 = Debug|monotouch_watch
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monotouch_watch.ActiveCfg = Release|monotouch_watch
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monotouch_watch.Build.0 = Release|monotouch_watch
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|orbis.ActiveCfg = Debug|orbis
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|orbis.Build.0 = Debug|orbis
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|orbis.ActiveCfg = Release|orbis
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|orbis.Build.0 = Release|orbis
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|unreal.ActiveCfg = Debug|unreal
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|unreal.Build.0 = Debug|unreal
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|unreal.ActiveCfg = Release|unreal
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|unreal.Build.0 = Release|unreal
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|wasm.ActiveCfg = Debug|wasm
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|wasm.Build.0 = Debug|wasm
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|wasm.ActiveCfg = Release|wasm
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|wasm.Build.0 = Release|wasm
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|winaot.ActiveCfg = Debug|winaot
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|winaot.Build.0 = Debug|winaot
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|winaot.ActiveCfg = Release|winaot
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|winaot.Build.0 = Release|winaot
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|xammac.ActiveCfg = Debug|xammac
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|xammac.Build.0 = Debug|xammac
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|xammac.ActiveCfg = Release|xammac
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|xammac.Build.0 = Release|xammac
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monodroid.ActiveCfg = Debug|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monodroid.ActiveCfg = Release|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monotouch.ActiveCfg = Debug|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monotouch.ActiveCfg = Release|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monotouch_tv.ActiveCfg = Debug|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monotouch_tv.ActiveCfg = Release|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|monotouch_watch.ActiveCfg = Debug|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|monotouch_watch.ActiveCfg = Release|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|orbis.ActiveCfg = Debug|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|orbis.ActiveCfg = Release|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|unreal.ActiveCfg = Debug|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|unreal.ActiveCfg = Release|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|wasm.ActiveCfg = Debug|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|wasm.ActiveCfg = Release|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|winaot.ActiveCfg = Debug|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|winaot.ActiveCfg = Release|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Debug|xammac.ActiveCfg = Debug|net_4_x
{AC3AC4DA-7C10-4AE9-A131-6DBBE61432E3}.Release|xammac.ActiveCfg = Release|net_4_x
{7C660E7A-C89B-4ACA-9458-492B6D14B168}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
{7C660E7A-C89B-4ACA-9458-492B6D14B168}.Debug|net_4_x.Build.0 = Debug|net_4_x
{7C660E7A-C89B-4ACA-9458-492B6D14B168}.Release|net_4_x.ActiveCfg = Release|net_4_x
+71 -40
View File
@@ -4,7 +4,7 @@
# This line is parsed by tools besides autoconf, such as msvc/mono.winconfig.targets.
# It should remain in the format they expect.
#
AC_INIT(mono, [6.6.0],
AC_INIT(mono, [6.7.0],
[https://github.com/mono/mono/issues/new])
AC_CONFIG_SRCDIR([README.md])
@@ -62,7 +62,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3`
# This line is parsed by tools besides autoconf, such as msvc/mono.winconfig.targets.
# It should remain in the format they expect.
#
MONO_CORLIB_VERSION=A144A63D-652C-4CCF-A9EE-8E5A091547F1
MONO_CORLIB_VERSION=69f9feb5-e6ef-4d90-8722-17346c85efb6
#
# Put a quoted #define in config.h.
@@ -1334,9 +1334,10 @@ with_wasm_default=no
with_bitcode_default=no
enable_cooperative_suspend_default=no
enable_hybrid_suspend_default=no
enable_copy_stack_data_default=yes
# For the sake of clearer error messages, these numbers should all be different from each other.
INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=10000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=4400,nftnptr-arg-trampolines=4000,nrgctx-trampolines=21000
INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=10000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=4400,nftnptr-arg-trampolines=4000
AOT_BUILD_ATTRS=$INVARIANT_AOT_OPTIONS
@@ -1359,6 +1360,7 @@ elif test x$with_runtime_preset = xnetcore; then
mono_feature_disable_mdb='yes'
mono_feature_disable_com='yes'
mono_feature_disable_gac='yes'
mono_feature_disable_perfcounters='yes'
disable_mono_native=yes
support_boehm=no
elif test x$with_runtime_preset = xnet_4_x; then
@@ -3391,29 +3393,13 @@ if test x$host_win32 = xno; then
AC_CHECK_DECL(ICANON, [AC_DEFINE(HAVE_ICANON, 1, [ICANON])], [], [[#include <termios.h>]])
AC_CHECK_DECL(TCSANOW, [AC_DEFINE(HAVE_TCSANOW, 1, [TCSANOW])], [], [[#include <termios.h>]])
AC_CHECK_MEMBER(struct stat.st_birthtimespec,
[AC_DEFINE(HAVE_STAT_BIRTHTIME, 1, [struct stat.st_birthtimespec])],
[],
[#include <sys/types.h>
#include <sys/stat.h>])
AC_CHECK_MEMBER(struct stat.st_atimespec,
[AC_DEFINE(HAVE_STAT_TIMESPEC, 1, [struct stat.st_atimespec])],
[],
[#include <sys/types.h>
#include <sys/stat.h>])
AC_CHECK_MEMBER(struct stat.st_atim,
[AC_DEFINE(HAVE_STAT_TIM, 1, [struct stat.st_atim])],
[],
[#include <sys/types.h>
#include <sys/stat.h>])
AC_CHECK_MEMBER(struct stat.st_atimensec,
[AC_DEFINE(HAVE_STAT_NSEC, 1, [struct stat.st_atimensec])],
[],
[#include <sys/types.h>
#include <sys/stat.h>])
AC_CHECK_MEMBER(struct dirent.d_namlen, [AC_DEFINE(HAVE_DIRENT_NAME_LEN, 1, [struct dirent.d_namlen])], [], [#include <dirent.h>])
AC_CHECK_MEMBER(struct statfs.f_fstypename, [AC_DEFINE(HAVE_STATFS_FSTYPENAME, 1, [struct statfs.f_fstypename])], [], [#include <sys/mount.h>])
AC_CHECK_MEMBER(struct statvfs.f_fstypename, [AC_DEFINE(HAVE_STATVFS_FSTYPENAME, 1, [struct statvfs.f_fstypename])], [], [#include <sys/mount.h>])
AC_CHECK_MEMBER(struct stat.st_birthtimespec, [AC_DEFINE(HAVE_STAT_BIRTHTIME, 1, [struct stat.st_birthtime])], [], [[#include <sys/types.h>], [#include <sys/stat.h>]])
AC_CHECK_MEMBER(struct stat.st_atimespec, [AC_DEFINE(HAVE_STAT_TIMESPEC, 1, [struct stat.st_atimespec])], [], [[#include <sys/types.h>], [#include <sys/stat.h>]])
AC_CHECK_MEMBER(struct stat.st_atim, [AC_DEFINE(HAVE_STAT_TIM, 1, [struct stat.st_atim])], [], [[#include <sys/types.h>], [#include <sys/stat.h>]])
AC_CHECK_MEMBER(struct stat.st_atimensec, [AC_DEFINE(HAVE_STAT_NSEC, 1, [struct stat.st_atimensec])], [], [[#include <sys/types.h>], [#include <sys/stat.h>]])
AC_CHECK_MEMBER(struct dirent.d_namlen, [AC_DEFINE(HAVE_DIRENT_NAME_LEN, 1, [struct dirent.d_namlen])], [], [[#include <dirent.h>]])
AC_CHECK_MEMBER(struct statfs.f_fstypename, [AC_DEFINE(HAVE_STATFS_FSTYPENAME, 1, [struct statfs.f_fstypename])], [], [[#include <sys/mount.h>]])
AC_CHECK_MEMBER(struct statvfs.f_fstypename, [AC_DEFINE(HAVE_STATVFS_FSTYPENAME, 1, [struct statvfs.f_fstypename])], [], [[#include <sys/mount.h>]])
AC_MSG_CHECKING(for struct statfs)
AC_TRY_COMPILE([
@@ -3778,7 +3764,6 @@ if test x$host_win32 = xno; then
AC_DEFINE(HAVE_GSSFW_HEADERS, 1, [GSS/GSS.h])
AC_DEFINE(HAVE_GSS_SPNEGO_MECHANISM, 1, [GSS_SPNEGO_MECHANISM])
enable_gss=yes
AC_DEFINE(ENABLE_GSS, 1, [ENABLE_GSS])
], [
AC_MSG_RESULT(no)
])
@@ -3790,7 +3775,6 @@ if test x$host_win32 = xno; then
],[
AC_MSG_RESULT(yes)
enable_gss=yes
AC_DEFINE(ENABLE_GSS, 1, [ENABLE_GSS])
], [
AC_MSG_RESULT(no)
])
@@ -4300,6 +4284,7 @@ jit_wanted=true
boehm_supported=true
BTLS_SUPPORTED=no
BTLS_PLATFORM=
INTERP_CFLAGS=""
case "$host" in
wasm32*)
@@ -4309,6 +4294,10 @@ case "$host" in
ACCESS_UNALIGNED="no"
with_tls=pthread
target_wasm=yes
if test "x$mono_cv_clang" = "xyes"; then
INTERP_CFLAGS="-mllvm -join-liveintervals=false"
AC_SUBST(INTERP_CFLAGS)
fi
;;
mips*)
TARGET=MIPS;
@@ -4624,7 +4613,6 @@ if test "x$host" != "x$target"; then
aarch64*darwin*_ilp32)
TARGET=ARM6432;
AC_DEFINE(MONO_ARCH_ILP32, 1, [64 bit mode with 4 byte longs and pointers])
sizeof_register=8
AC_DEFINE(TARGET_WATCHOS, 1, [...])
;;
aarch64-*)
@@ -5675,6 +5663,38 @@ AM_CONDITIONAL([ENABLE_HYBRID_SUSPEND], [test x$enable_hybrid_suspend != xno])
dnl End of thread suspend policy
dnl *******************************
dnl *** Copy stack data support ***
dnl *******************************
dnl Disable copy_stack_data on platforms supporting full context and
dnl having access to full stack of running threads.
if test x$enable_copy_stack_data_default != xno; then
case $HOST in
X86 | AMD64)
if test x$target_osx = xyes; then
dnl Some host/target confusion, there's no host_osx (and
dnl host_darwin would be true on iOS not just macOS).
enable_copy_stack_data_default=no
elif test x$host_linux = xyes -o x$host_win32 = xyes; then
enable_copy_stack_data_default=no
fi
;;
esac
fi
AC_ARG_ENABLE(copy_stack_data, [ --enable-copy-stack-data Enable copy_stack_data feature for hybrid/cooperative suspend scenarios, (defaults to yes)], [], [enable_copy_stack_data=default])
if test x$enable_copy_stack_data = xdefault; then
enable_copy_stack_data=$enable_copy_stack_data_default
fi
if test x$enable_copy_stack_data != xno ; then
AC_DEFINE(ENABLE_COPY_STACK_DATA,1,[Enable copy_stack_data feature for hybrid/cooperative suspend scenarios])
fi
dnl End of Copy stack data support
dnl ***************************
dnl *** feature experiments ***
dnl ***************************
@@ -6026,8 +6046,8 @@ fi
AC_SUBST(mono_runtime)
AC_SUBST(mono_runtime_wrapper)
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.4.0/csc.exe
VBCS_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.4.0/VBCSCompiler.exe
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.3.0/csc.exe
VBCS_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.3.0/VBCSCompiler.exe
if test $csc_compiler = mcs; then
CSC=$mcs_topdir/class/lib/build/mcs.exe
@@ -6393,11 +6413,7 @@ elif test x$host_linux = xyes; then
MONO_NATIVE_CXXFLAGS=$CXXFLAGS
MONO_NATIVE_CFLAGS=$CFLAGS
MONO_NATIVE_LDFLAGS=$LDFLAGS
if test x$enable_gss = xyes; then
MONO_NATIVE_LDFLAGS="$MONO_NATIVE_LDFLAGS -lgssapi_krb5"
else
AC_MSG_WARN([GSS is not enabled, it requires libkrb5-dev package])
fi
mono_native=yes
mono_native_compat=no
MONO_NATIVE_PLATFORM=linux
@@ -6467,6 +6483,22 @@ elif case $host_os in freebsd*) true;; *) false;; esac; then
AC_MSG_RESULT(freebsd)
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_FREEBSD"
elif case $host_os in netbsd*) true;; *) false;; esac; then
mono_native_text="NetBSD"
MONO_NATIVE_CC=$CC
MONO_NATIVE_CXX=$CXX
MONO_NATIVE_CPPFLAGS=$CPPFLAGS
MONO_NATIVE_CXXFLAGS=$CXXFLAGS
MONO_NATIVE_CFLAGS=$CFLAGS
MONO_NATIVE_LDFLAGS=$LDFLAGS
mono_native=yes
mono_native_compat=no
MONO_NATIVE_PLATFORM=netbsd
AC_MSG_CHECKING([Mono.Native support])
AC_MSG_RESULT(netbsd)
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_NETBSD"
elif case $host_os in haiku*) true;; *) false;; esac; then
mono_native_text="Haiku"
MONO_NATIVE_CC=$CC
@@ -6540,6 +6572,7 @@ AM_CONDITIONAL(MONO_NATIVE_PLATFORM_LINUX, test x$MONO_NATIVE_PLATFORM = xlinux)
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_AIX, test x$MONO_NATIVE_PLATFORM = xaix)
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_ANDROID, test x$MONO_NATIVE_PLATFORM = xandroid)
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_FREEBSD, test x$MONO_NATIVE_PLATFORM = xfreebsd)
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_NETBSD, test x$MONO_NATIVE_PLATFORM = xnetbsd)
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_HAIKU, test x$MONO_NATIVE_PLATFORM = xhaiku)
MONO_NATIVE_PLATFORM_TYPE_COMPAT="$MONO_NATIVE_PLATFORM_TYPE | MONO_NATIVE_PLATFORM_TYPE_COMPAT"
@@ -6620,10 +6653,10 @@ fi
#
AC_MSG_CHECKING([for large file support])
AC_COMPILE_IFELSE(
[
[AC_LANG_SOURCE([
#include <sys/types.h>
off64_t dummy = 0;
], [
])], [
AC_MSG_RESULT(yes)
# FIXME The ramifications of _LARGEFILE64_SOURCE are not understood.
# ZLIB_CFLAGS="$ZLIB_CFLAGS -D_LARGEFILE64_SOURCE=1"
@@ -6799,9 +6832,7 @@ fi
echo "sysconfdir=$sysconfdir" >> $mcs_topdir/build/config.make
echo 'mono_libdir=${exec_prefix}/lib' >> $mcs_topdir/build/config.make
echo "mono_build_root=$mono_build_root" >> $mcs_topdir/build/config.make
echo 'IL_FLAGS = /debug' >> $mcs_topdir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $mcs_topdir/build/config.make
echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $mcs_topdir/build/config.make
echo "JAY_CFLAGS = $JAY_CFLAGS" >> $mcs_topdir/build/config.make
echo "VERSION = $VERSION" >> $mcs_topdir/build/config.make
+4 -4
View File
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="5.0.0-alpha1.19375.11">
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="5.0.0-alpha1.19409.2">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>97d5957fc71853961082e22873d926269b291b92</Sha>
<Sha>719b8fb635db44ba80ea6d5f2e7effaf5906f588</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha1.19375.9">
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha1.19409.2">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2977763fd35b8dc120f4eac94314aba7b05ae9ee</Sha>
<Sha>cd732014d34f3b72375115e78f84c4617bce6b48</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers" Version="3.3.0-beta2-19381-14">
<Uri>https://github.com/dotnet/roslyn</Uri>
+2 -2
View File
@@ -5,9 +5,9 @@
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
<!-- Package versions -->
<!-- corefx -->
<MicrosoftPrivateCoreFxNETCoreAppVersion>5.0.0-alpha1.19375.11</MicrosoftPrivateCoreFxNETCoreAppVersion>
<MicrosoftPrivateCoreFxNETCoreAppVersion>5.0.0-alpha1.19409.2</MicrosoftPrivateCoreFxNETCoreAppVersion>
<!-- core-setup -->
<MicrosoftNETCoreAppVersion>5.0.0-alpha1.19375.9</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreAppVersion>5.0.0-alpha1.19409.2</MicrosoftNETCoreAppVersion>
<!-- roslyn -->
<MicrosoftNetCompilersVersion>3.3.0-beta2-19374-02</MicrosoftNetCompilersVersion>
</PropertyGroup>
+1 -1
+1 -1
-2
View File
@@ -693,8 +693,6 @@ compiler so that csc can be used.
Always use `/r:foo.dll`, not `/r:foo`. Windows requires the former.
Use `/r:$(corlib)`, not `/r:corlib`.
If you're writing shell script code as part of a make rule, remember
that Windows has command-line length limits. So something like
-8
View File
@@ -11,14 +11,6 @@ PLATFORM_RUNTIME
The system runtime for executing CLR programs. Blank on Win32,
probably $(RUNTIME) (the Mono runtime) on everything else.
PLATFORM_CORLIB
The name of the system's corlib. 'mscorlib.dll'
PLATFORM_MAKE_CORLIB_CMP
Define it to something nonempty if corlib_cmp.dll should be built
on this platform. Only should be done if the platform provides its
own non-Mono runtime that we can compare corlibs with.
PLATFORM_TWEAK_CORLIB_SOURCES
A command to futz around with the sources to mscorlib.dll. See linux.make
and win32.make for examples. Should be 'cat' unless you know what you're
-2
View File
@@ -21,7 +21,6 @@ TEST_HARNESS = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/$(PARENT_PROFILE)nunit-l
PLATFORM_DEBUG_FLAGS = /debug:portable
# Workaround for https://bugzilla.xamarin.com/show_bug.cgi?id=59967
MCS_FLAGS = /features:peverify-compat /langversion:latest
MBAS_FLAGS = -debug
LIBRARY_FLAGS =
ifndef CFLAGS
CFLAGS = -g -O2
@@ -41,7 +40,6 @@ TEST_RUNTIME = MONO_PATH="$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH
# keep track of the default value
DEFAULT_MCS_FLAGS := $(MCS_FLAGS)
DEFAULT_MBAS_FLAGS := $(MBAS_FLAGS)
DEFAULT_PROFILE := net_4_x
# You shouldn't need to set these but might on a
-17
View File
@@ -5,20 +5,12 @@
PLATFORM_MCS_FLAGS =
PLATFORM_RUNTIME = $(RUNTIME)
PLATFORM_CORLIB = mscorlib.dll
PLATFORM_TEST_HARNESS_EXCLUDES =
EXTERNAL_MCS = mcs
EXTERNAL_MBAS = mbas
EXTERNAL_RUNTIME = mono
#ILDISASM = monodis
ILDISASM = false
PLATFORM_PATH_SEPARATOR = :
# Define this if this ever will work on Linux
# PLATFORM_MAKE_CORLIB_CMP = yes
# This is for changing / to \ on windows
PLATFORM_CHANGE_SEPARATOR_CMD = cat
@@ -27,12 +19,3 @@ hidden_suffix =
platform-check:
@:
# I tried this but apparently Make's version strings aren't that
# ... consistent between releases. Whatever.
#
# @if ! $(MAKE) --version |grep '^GNU Make version 3' 1>/dev/null 2>&1 ; then \
# echo "*** You need to build MCS with GNU make. Try \`gmake'" ; \
# exit 1 ; \
# fi
PLATFORM_LINUX=1
-17
View File
@@ -5,20 +5,12 @@
PLATFORM_MCS_FLAGS =
PLATFORM_RUNTIME = $(RUNTIME)
PLATFORM_CORLIB = mscorlib.dll
PLATFORM_TEST_HARNESS_EXCLUDES = NotOnMac
EXTERNAL_MCS = mcs
EXTERNAL_MBAS = mbas
EXTERNAL_RUNTIME = mono
#ILDISASM = monodis
ILDISASM = false
PLATFORM_PATH_SEPARATOR = :
# Define this if this ever will work on Linux
# PLATFORM_MAKE_CORLIB_CMP = yes
# This is for changing / to \ on windows
PLATFORM_CHANGE_SEPARATOR_CMD = cat
@@ -27,12 +19,3 @@ hidden_suffix =
platform-check:
@:
# I tried this but apparently Make's version strings aren't that
# ... consistent between releases. Whatever.
#
# @if ! $(MAKE) --version |grep '^GNU Make version 3' 1>/dev/null 2>&1 ; then \
# echo "*** You need to build MCS with GNU make. Try \`gmake'" ; \
# exit 1 ; \
# fi
PLATFORM_MACOS=1
-18
View File
@@ -5,20 +5,12 @@
PLATFORM_MCS_FLAGS =
PLATFORM_RUNTIME = $(RUNTIME)
PLATFORM_CORLIB = mscorlib.dll
PLATFORM_TEST_HARNESS_EXCLUDES =
EXTERNAL_MCS = mcs
EXTERNAL_MBAS = mbas
EXTERNAL_RUNTIME = mono
#ILDISASM = monodis
ILDISASM = false
PLATFORM_PATH_SEPARATOR = :
# Define this if this ever will work on Unix
# PLATFORM_MAKE_CORLIB_CMP = yes
# This is for changing / to \ on windows
PLATFORM_CHANGE_SEPARATOR_CMD = cat
@@ -27,13 +19,3 @@ hidden_suffix =
platform-check:
@:
# I tried this but apparently Make's version strings aren't that
# ... consistent between releases. Whatever.
#
# @if ! $(MAKE) --version |grep '^GNU Make version 3' 1>/dev/null 2>&1 ; then \
# echo "*** You need to build MCS with GNU make. Try \`gmake'" ; \
# exit 1 ; \
# fi
PLATFORM_UNIX=1
-12
View File
@@ -5,21 +5,10 @@
PLATFORM_MCS_FLAGS =
PLATFORM_RUNTIME =
PLATFORM_CORLIB = mscorlib.dll
PLATFORM_TEST_HARNESS_EXCLUDES = NotOnWindows
EXTERNAL_MCS = mcs
EXTERNAL_MBAS = vbc.exe
EXTERNAL_RUNTIME = mono
# Disabled since it needs the SDK
#ILDISASM = ildasm.exe /test
#ILDISASM = monodis.bat
## Gross hack
ILDISASM = $(topdir)/../mono/mono/dis/monodis
PLATFORM_MAKE_CORLIB_CMP = yes
PLATFORM_CHANGE_SEPARATOR_CMD=tr '/' '\\\\'
PLATFORM_PATH_SEPARATOR = ;
@@ -31,4 +20,3 @@ hidden_suffix = .tmp
platform-check:
@:
PLATFORM_WIN32=1
+1 -2
View File
@@ -35,9 +35,8 @@ MOBILE_DYNAMIC = yes
MOBILE_PROFILE = yes
NO_CONSOLE = yes
ifdef PLATFORM_WIN32
ifeq ($(HOST_PLATFORM),win32)
PROFILE_MCS_FLAGS += -d:MOBILE_DESKTOP_HOST -d:WIN_PLATFORM
endif
ENABLE_GSS=1
PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking PKITS InetAccess AndroidNotWorking
+1 -7
View File
@@ -7,8 +7,6 @@ MCS = $(BOOTSTRAP_MCS)
PLATFORMS = macos linux win32 unix
# nuttzing!
profile-check:
@:
@@ -21,11 +19,7 @@ XBUILD_VERSION = 4.0
ENFORCE_LIBRARY_WARN_AS_ERROR = yes
ifdef PLATFORM_MACOS
ifeq ($(HOST_PLATFORM),macos)
MONO_FEATURE_APPLETLS=1
ENABLE_GSS=1
endif
ifeq ($(HOST_PLATFORM),linux)
ENABLE_GSS=1
endif
-6
View File
@@ -42,11 +42,9 @@ COMPILER_SERVER_ARGS = $(if $(findstring 1,$(ENABLE_COMPILER_SERVER)),$(COMPILER
CSC_LOCATION = $(if $(findstring 1,$(ENABLE_COMPILER_SERVER)),$(SERVER_CSC_LOCATION),$(STANDALONE_CSC_LOCATION))
USE_MCS_FLAGS = $(COMPILER_SERVER_ARGS) /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
USE_MBAS_FLAGS = $(COMPILER_SERVER_ARGS) /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 --clr-memory-model
BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
CCOMPILE = $(CC) $(USE_CFLAGS)
BOOT_COMPILE = $(Q_MCS) $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
INSTALL = $(SHELL) $(topdir)/../mono/install-sh
@@ -54,7 +52,6 @@ INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_BIN = $(INSTALL) -c -m 755
INSTALL_LIB = $(INSTALL_BIN)
MKINSTALLDIRS = $(SHELL) $(topdir)/mkinstalldirs
INTERNAL_MBAS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mbas/mbas.exe
INTERNAL_CSC_LOCATION = $(CSC_LOCATION)
# Using CSC_SDK_PATH_DISABLED for sanity check that all references have path specified
@@ -100,9 +97,6 @@ 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)
endif
# Useful
ifeq ($(PLATFORM_RUNTIME),$(RUNTIME))
+3 -1
View File
@@ -128,7 +128,7 @@ $(test_nunit_dep): $(topdir)/build/deps/nunit-$(PROFILE).stamp
@if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi
$(topdir)/build/deps/nunit-$(PROFILE).stamp:
$(MAKE) -C ${topdir}/tools/nunit-lite
cd ${topdir}/tools/nunit-lite && $(MAKE)
echo "stamp" >$@
tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp
@@ -378,3 +378,5 @@ $(xtest_makefrag): $(xtest_response)
endif
.PHONY: patch-nunitlite-appconfig
+1 -1
View File
@@ -38,7 +38,7 @@ doc-update-recursive:
@echo "do not recurse the Facades folder"
System System.Core System.ComponentModel.DataAnnotations System.Numerics System.Numerics.Vectors System.Runtime.Serialization System.Transactions System.Xml \
System.ComponentModel.Composition System.ServiceModel System.Xml.Linq System.Data System.Data.DataSetExtensions System.IO.Compression.FileSystem System.Runtime.InteropServices.RuntimeInformation \
System.ComponentModel.Composition System.ServiceModel System.Xml.Linq System.Data System.IO.Compression.FileSystem System.Runtime.InteropServices.RuntimeInformation \
System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression System.IdentityModel System.Web \
Facades/System.Drawing.Primitives Facades/System.Drawing.Common System.Drawing System.Web.Services:
@@ -29,72 +29,72 @@
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<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;FEATURE_TYPECONVERTER</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>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monotouch' ">
<OutputPath>./../../../class/lib/monotouch/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<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_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;FEATURE_TYPECONVERTER</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_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
<OutputPath>./../../../class/lib/monotouch_watch/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<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_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH;FEATURE_TYPECONVERTER</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_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
<OutputPath>./../../../class/lib/monotouch_tv/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<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_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV;FEATURE_TYPECONVERTER</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_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
<OutputPath>./../../../class/lib/testing_aot_full_interp/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_REMOTING;DISABLE_SECURITY;FULL_AOT_INTERP;DISABLE_COM;FEATURE_TYPECONVERTER</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_REMOTING;DISABLE_SECURITY;FULL_AOT_INTERP;DISABLE_COM</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
<OutputPath>./../../../class/lib/testing_aot_hybrid/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_REMOTING;DISABLE_SECURITY;MOBILE_DYNAMIC;FEATURE_TYPECONVERTER</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_REMOTING;DISABLE_SECURITY;MOBILE_DYNAMIC</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_REMOTING;DISABLE_SECURITY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_COM;FEATURE_TYPECONVERTER</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_REMOTING;DISABLE_SECURITY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_COM</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_COM;WIN_PLATFORM;WINAOT;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;FEATURE_TYPECONVERTER</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_COM;WIN_PLATFORM;WINAOT;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'testing_winaot_interp' ">
<OutputPath>./../../../class/lib/testing_winaot_interp/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_COM;WIN_PLATFORM;WINAOT;FULL_AOT_INTERP;DISABLE_SECURITY;DISABLE_REMOTING;FEATURE_TYPECONVERTER</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_COM;WIN_PLATFORM;WINAOT;FULL_AOT_INTERP;DISABLE_SECURITY;DISABLE_REMOTING</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'xammac' ">
<OutputPath>./../../../class/lib/xammac/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<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;FEATURE_TYPECONVERTER</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>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<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;FEATURE_TYPECONVERTER</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>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'orbis' ">
<OutputPath>./../../../class/lib/orbis/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<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_COM;FEATURE_TYPECONVERTER</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_COM</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'unreal' ">
<OutputPath>./../../../class/lib/unreal/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO;FEATURE_TYPECONVERTER</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'wasm' ">
<OutputPath>./../../../class/lib/wasm/Facades</OutputPath>
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
<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;WASM;DISABLE_COM;FEATURE_NO_BSD_SOCKETS;DISABLE_REMOTING;DISABLE_SECURITY;FEATURE_TYPECONVERTER</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;WASM;DISABLE_COM;FEATURE_NO_BSD_SOCKETS;DISABLE_REMOTING;DISABLE_SECURITY</DefineConstants>
</PropertyGroup>
<!-- @ALL_PROFILE_PROPERTIES@ -->
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -13,7 +13,7 @@ KEYFILE = ../../Open.snk
LIBRARY_SNK = $(KEYFILE)
SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS) -d:FEATURE_TYPECONVERTER
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
ifneq (,$(filter build net_4_x, $(PROFILE)))
$(error This profile shouldn't build System.Drawing.Common.dll, it already has System.Drawing.dll)
@@ -175,7 +175,6 @@
<ProjectReference Include="../../System.Transactions/System.Transactions.csproj" />
<ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization.csproj" />
<ProjectReference Include="../../System.Data/System.Data.csproj" />
<ProjectReference Include="../../System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj" />
<ProjectReference Include="../../corlib/corlib.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+4 -4
View File
@@ -22,13 +22,13 @@ ifeq ($(PROFILE),build)
LIB_MCS_FLAGS += -d:SYSTEM_WEB_IMPLEMENTATION
else ifeq ($(PROFILE),wasm)
LIB_MCS_FLAGS += -d:SYSTEM_WEB_IMPLEMENTATION -unsafe
LIB_REFS += System.Transactions System.Runtime.Serialization System.Data System.Data.DataSetExtensions
LIB_REFS += System.Transactions System.Runtime.Serialization System.Data
else ifeq ($(PROFILE),xammac_net_4_5)
LIB_REFS += System.Web.Services System.Transactions System.Runtime.Serialization System.Data System.Data.DataSetExtensions
LIB_REFS += System.Web.Services System.Transactions System.Runtime.Serialization System.Data
else ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_REFS += System.Web.Services System.Transactions System.Runtime.Serialization System.Data System.Data.DataSetExtensions
LIB_REFS += System.Web.Services System.Transactions System.Runtime.Serialization System.Data
else
LIB_REFS += System.Web System.Transactions System.Runtime.Serialization System.Data System.Data.DataSetExtensions
LIB_REFS += System.Web System.Transactions System.Runtime.Serialization System.Data
endif
ifneq (,$(filter build net_4_x, $(PROFILE)))
@@ -764,16 +764,6 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlTypeException))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlXml))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.StorageState))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.DataRowComparer))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.DataRowComparer<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.DataRowExtensions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.DataTableExtensions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.EnumerableRowCollection))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.EnumerableRowCollection<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.EnumerableRowCollectionExtensions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.OrderedEnumerableRowCollection<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.TypedTableBase<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.TypedTableBaseExtensions))]
#endif
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.BooleanSwitch))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.ConditionalAttribute))]
@@ -831,15 +821,6 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.TraceSwitch))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.SuppressMessageAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.AllowNullAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.DisallowNullAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.MaybeNullAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.NotNullAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.MaybeNullWhenAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.NotNullWhenAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.NotNullIfNotNullAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.DoesNotReturnAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Contracts.Contract))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Contracts.ContractAbbreviatorAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Contracts.ContractArgumentValidatorAttribute))]
@@ -2462,9 +2443,6 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySpanAction<,>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequence<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequenceSegment<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ArrayBufferWriter<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.SequenceReader<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.SequenceReaderExtensions))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.SpanAction<,>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.StandardFormat))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Binary.BinaryPrimitives))]
-3
View File
@@ -77,7 +77,6 @@ mobile_common_dirs_parallel := \
System.Numerics \
System.Numerics.Vectors \
System.Data \
System.Data.DataSetExtensions \
Mono.Data.Sqlite \
System.Data.Services.Client \
System.IO.Compression \
@@ -180,7 +179,6 @@ wasm_dirs_parallel := \
System.ServiceModel.Internals \
System.Runtime.Serialization \
System.Data \
System.Data.DataSetExtensions \
System.Xml.Linq \
System.Numerics \
System.Numerics.Vectors \
@@ -215,7 +213,6 @@ xammac_4_5_dirs_parallel := \
System.Transactions \
System.EnterpriseServices \
System.Data \
System.Data.DataSetExtensions \
System.Runtime.Serialization \
System.Xml.Linq \
Mono.Data.Sqlite \
@@ -307,15 +307,8 @@ namespace Mono.Debugger.Soft
public bool Subclasses {
get; set;
}
public bool NotFilteredFeature {
get; set;
}
public bool EverythingElse {
get; set;
}
}
class AssemblyModifier : Modifier {
public long[] Assemblies {
get; set;
@@ -436,7 +429,7 @@ namespace Mono.Debugger.Soft
* with newer runtimes, and vice versa.
*/
internal const int MAJOR_VERSION = 2;
internal const int MINOR_VERSION = 54;
internal const int MINOR_VERSION = 53;
enum WPSuspendPolicy {
NONE = 0,
@@ -1318,8 +1311,6 @@ namespace Mono.Debugger.Soft
protected abstract int TransportSend (byte[] buf, int buf_offset, int len);
protected abstract void TransportSetTimeouts (int send_timeout, int receive_timeout);
protected abstract void TransportClose ();
// Shutdown breaks all communication, resuming blocking waits
protected abstract void TransportShutdown ();
internal VersionInfo Version;
@@ -1436,7 +1427,6 @@ namespace Mono.Debugger.Soft
internal void Close () {
closed = true;
TransportShutdown ();
}
internal bool IsClosed {
@@ -2642,10 +2632,6 @@ namespace Mono.Debugger.Soft
} else if (!em.Subclasses) {
throw new NotSupportedException ("This request is not supported by the protocol version implemented by the debuggee.");
}
if (Version.MajorVersion > 2 || Version.MinorVersion >= 54) {
w.WriteBool (em.NotFilteredFeature);
w.WriteBool (em.EverythingElse);
}
} else if (mod is AssemblyModifier) {
w.WriteByte ((byte)ModifierKind.ASSEMBLY_ONLY);
var amod = (mod as AssemblyModifier);
@@ -2868,11 +2854,6 @@ namespace Mono.Debugger.Soft
{
socket.Close ();
}
protected override void TransportShutdown ()
{
socket.Shutdown (SocketShutdown.Both);
}
}
/* This is the interface exposed by the debugger towards the debugger agent */
@@ -6,9 +6,9 @@ namespace Mono.Debugger.Soft
public sealed class ExceptionEventRequest : EventRequest {
TypeMirror exc_type;
bool caught, uncaught, subclasses, not_filtered_feature, everything_else;
bool caught, uncaught, subclasses;
internal ExceptionEventRequest (VirtualMachine vm, TypeMirror exc_type, bool caught, bool uncaught, bool not_filtered_feature = false, bool everything_else = false) : base (vm, EventType.Exception) {
internal ExceptionEventRequest (VirtualMachine vm, TypeMirror exc_type, bool caught, bool uncaught) : base (vm, EventType.Exception) {
if (exc_type != null) {
CheckMirror (vm, exc_type);
TypeMirror exception_type = vm.RootDomain.Corlib.GetType ("System.Exception", false, false);
@@ -19,8 +19,6 @@ namespace Mono.Debugger.Soft
this.caught = caught;
this.uncaught = uncaught;
this.subclasses = true;
this.not_filtered_feature = not_filtered_feature;
this.everything_else = everything_else;
}
public TypeMirror ExceptionType {
@@ -43,7 +41,7 @@ namespace Mono.Debugger.Soft
public override void Enable () {
var mods = new List <Modifier> ();
mods.Add (new ExceptionModifier () { Type = exc_type != null ? exc_type.Id : 0, Caught = caught, Uncaught = uncaught, Subclasses = subclasses, NotFilteredFeature = not_filtered_feature, EverythingElse = everything_else });
mods.Add (new ExceptionModifier () { Type = exc_type != null ? exc_type.Id : 0, Caught = caught, Uncaught = uncaught, Subclasses = subclasses });
SendReq (mods);
}
}
@@ -150,11 +150,8 @@ namespace Mono.Debugger.Soft
}
public void Detach () {
// Notify the application that we are detaching
conn.VM_Dispose ();
// Close the connection. No further messages can be sent
// over the connection after this point.
conn.Close ();
conn.VM_Dispose ();
notify_vm_event (EventType.VMDisconnect, SuspendPolicy.None, 0, 0, null, 0);
}
@@ -280,13 +277,6 @@ namespace Mono.Debugger.Soft
return new ExceptionEventRequest (this, exc_type, caught, uncaught);
}
public ExceptionEventRequest CreateExceptionRequest (TypeMirror exc_type, bool caught, bool uncaught, bool everything_else) {
if (Version.AtLeast (2, 54))
return new ExceptionEventRequest (this, exc_type, caught, uncaught, true, everything_else);
else
return new ExceptionEventRequest (this, exc_type, caught, uncaught);
}
public AssemblyLoadEventRequest CreateAssemblyLoadRequest () {
return new AssemblyLoadEventRequest (this);
}
@@ -350,17 +350,6 @@ class TestIfaces : ITest
}
}
public class RuntimeInvokeWithThrowClass
{
public RuntimeInvokeWithThrowClass()
{
}
public void RuntimeInvokeThrowMethod()
{
throw new Exception("thays");
}
}
public sealed class DebuggerTaskScheduler : TaskScheduler, IDisposable
{
private readonly BlockingCollection<Task> _tasks = new BlockingCollection<Task>();
@@ -518,10 +507,6 @@ public class Tests : TestsBase, ITest2
unhandled_exception_wrapper ();
return 0;
}
if (args.Length >0 && args [0] == "unhandled-exception-perform-wait-callback") {
unhandled_exception_perform_wait_callback ();
return 0;
}
if (args.Length >0 && args [0] == "unhandled-exception-endinvoke") {
unhandled_exception_endinvoke ();
return 0;
@@ -554,10 +539,6 @@ public class Tests : TestsBase, ITest2
run_step_out_void_async();
return 0;
}
if (args.Length > 0 && args [0] == "runtime_invoke_hybrid_exceptions") {
runtime_invoke_hybrid_exceptions();
return 0;
}
assembly_load ();
breakpoints ();
single_stepping ();
@@ -603,7 +584,6 @@ public class Tests : TestsBase, ITest2
inspect_enumerator_in_generic_struct();
if_property_stepping();
fixed_size_array();
test_new_exception_filter();
return 3;
}
@@ -615,11 +595,6 @@ public class Tests : TestsBase, ITest2
}
}
public class MyException : Exception {
public MyException(string message) : base(message) {
}
}
public static void if_property_stepping() {
var test = new TestClass();
if (test.OneLineProperty == "someInvalidValue6049e709-7271-41a1-bc0a-f1f1b80d4125")
@@ -852,57 +827,6 @@ public class Tests : TestsBase, ITest2
n.Buffer2 = new char4('a', 'b', 'c', 'd');
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public static void test_new_exception_filter () {
test_new_exception_filter1();
test_new_exception_filter2();
test_new_exception_filter3();
test_new_exception_filter4();
}
public static void test_new_exception_filter1 () {
try {
throw new Exception("excp");
}
catch (Exception e) {
}
}
public static void test_new_exception_filter2 () {
try {
throw new MyException("excp");
}
catch (Exception e) {
}
}
public static void test_new_exception_filter3 () {
try {
throw new ArgumentException();
}
catch (Exception e) {
}
try {
throw new Exception("excp");
}
catch (Exception e) {
}
}
public static void test_new_exception_filter4 () {
try {
throw new ArgumentException();
}
catch (Exception e) {
}
try {
throw new Exception("excp");
}
catch (Exception e) {
}
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public static void inspect_enumerator_in_generic_struct() {
TestEnumeratorInsideGenericStruct<String, String> generic_struct = new TestEnumeratorInsideGenericStruct<String, String>(new KeyValuePair<string, string>("0", "f1"));
@@ -1668,24 +1592,6 @@ public class Tests : TestsBase, ITest2
public static void unhandled_exception_endinvoke_2 () {
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public static void unhandled_exception_perform_wait_callback () {
try
{
var results = ResolveAsync().GetAwaiter().GetResult();
}
catch (SocketException sockEx)
{
//Console.WriteLine("correctly handled");
}
}
public static async Task<List<string>> ResolveAsync()
{
var addresses = await System.Net.Dns.GetHostAddressesAsync("foo.bar.baz");
return new List<string>(addresses.Select(addr => addr.ToString()));
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public static void unhandled_exception_endinvoke () {
Action action = new Action (() =>
@@ -2206,16 +2112,6 @@ public class Tests : TestsBase, ITest2
public static ref BlittableStruct get_ref_struct() {
return ref ref_return_struct;
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public static void runtime_invoke_hybrid_exceptions () {
Type rtType = Type.GetType("RuntimeInvokeWithThrowClass");
ConstructorInfo rtConstructor = rtType.GetConstructor(Type.EmptyTypes);
object rtObject = rtConstructor.Invoke(new object[] { });
MethodInfo rtMethod = rtType.GetMethod("RuntimeInvokeThrowMethod");
rtMethod.Invoke(rtObject, new object[] { });
}
}
public class SentinelClass : MarshalByRefObject {
+3 -71
View File
@@ -1767,7 +1767,7 @@ public class DebuggerTests
t = frame.Method.GetParameters ()[7].ParameterType;
Assert.AreEqual ("Tests", t.Name);
var nested = (from nt in t.GetNestedTypes () where nt.IsNestedPublic select nt).ToArray ();
Assert.AreEqual (2, nested.Length);
Assert.AreEqual (1, nested.Length);
Assert.AreEqual ("NestedClass", nested [0].Name);
Assert.IsTrue (t.BaseType.IsAssignableFrom (t));
Assert.IsTrue (!t.IsAssignableFrom (t.BaseType));
@@ -4233,6 +4233,8 @@ public class DebuggerTests
var e = run_until ("unhandled_exception_endinvoke");
vm.Resume ();
var e1 = GetNextEvent (); //this should be the exception
vm.Resume ();
var e2 = GetNextEvent ();
Assert.IsFalse (e2 is ExceptionEvent);
@@ -4279,23 +4281,6 @@ public class DebuggerTests
vm = null;
}
[Test]
public void UnhandledException4 () {
vm.Exit (0);
Start (dtest_app_path, "unhandled-exception-perform-wait-callback");
var req = vm.CreateExceptionRequest (null, false, true);
req.Enable ();
var e = run_until ("unhandled_exception_perform_wait_callback");
vm.Resume ();
var e2 = GetNextEvent ();
Assert.IsTrue (e2 is VMDeathEvent);
vm = null;
}
[Test]
public void GCWhileSuspended () {
// Check that objects are kept alive during suspensions
@@ -4466,7 +4451,6 @@ public class DebuggerTests
}
[Test]
[Category ("NotWorkingRuntimeInterpreter")]
public void SetIP2 () {
var bevent = run_until ("set_ip_1");
@@ -5101,58 +5085,6 @@ public class DebuggerTests
Assert.AreEqual("d", min.Value);
}
[Test]
public void TestExceptionFilterWin () {
Event e = run_until ("test_new_exception_filter1");
var req2 = vm.CreateExceptionRequest (vm.RootDomain.Corlib.GetType ("System.Exception"), true, true, false);
req2.Enable ();
vm.Resume ();
Event ev = GetNextEvent ();
var l = ev.Thread.GetFrames ()[0].Location;
Assert.IsInstanceOfType (typeof (ExceptionEvent), ev);
req2.Disable ();
run_until ("test_new_exception_filter2");
req2 = vm.CreateExceptionRequest (null, true, true, false);
req2.Enable ();
vm.Resume ();
ev = GetNextEvent ();
Assert.IsInstanceOfType (typeof (ExceptionEvent), ev);
req2.Disable ();
run_until ("test_new_exception_filter3");
var req3 = vm.CreateExceptionRequest (vm.RootDomain.Corlib.GetType ("System.ArgumentException"), false, true, false);
req3.Enable ();
req2 = vm.CreateExceptionRequest (null, true, true, true);
req2.Enable ();
vm.Resume ();
ev = GetNextEvent ();
Assert.IsInstanceOfType (typeof (ExceptionEvent), ev);
req2.Disable ();
req3.Disable ();
run_until ("test_new_exception_filter4");
req2 = vm.CreateExceptionRequest (null, true, true, true);
req2.Enable ();
req2 = vm.CreateExceptionRequest (vm.RootDomain.Corlib.GetType ("System.ArgumentException"), false, true, false);
req2.Enable ();
vm.Resume ();
ev = GetNextEvent ();
}
[Test]
public void TestRuntimeInvokeHybridSuspendExceptions () {
TearDown ();
Start (dtest_app_path, "runtime_invoke_hybrid_exceptions", forceExit: true);
var req2 = vm.CreateExceptionRequest (null, false, true, false);
req2.Enable ();
vm.Resume ();
var ev = GetNextEvent ();
Assert.IsInstanceOfType (typeof (ExceptionEvent), ev);
vm.Exit (0);
vm = null;
}
#endif
} // class DebuggerTests
} // namespace
+1
View File
@@ -488,6 +488,7 @@
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
<Compile Include="..\..\build\common\SR.cs" />
<Compile Include="..\corlib\System.Runtime.CompilerServices\PreserveDependencyAttribute.cs" />
<Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Action.cs" />
<Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Extension.cs" />
<Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Function.cs" />
@@ -2,6 +2,8 @@
../../build/common/SR.cs
../../build/common/MonoTODOAttribute.cs
../corlib/System.Runtime.CompilerServices/PreserveDependencyAttribute.cs
Assembly/AssemblyInfo.cs
System/Util.cs
System.IO.MemoryMappedFiles/MemoryMappedFile.cs
@@ -30,76 +30,6 @@
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
<OutputPath>./../../class/lib/monodroid</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monodroid</IntermediateOutputPath>
<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;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monotouch' ">
<OutputPath>./../../class/lib/monotouch</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monotouch</IntermediateOutputPath>
<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_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
<OutputPath>./../../class/lib/monotouch_watch</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monotouch_watch</IntermediateOutputPath>
<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_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
<OutputPath>./../../class/lib/monotouch_tv</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monotouch_tv</IntermediateOutputPath>
<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_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
<OutputPath>./../../class/lib/testing_aot_full_interp</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_full_interp</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_REMOTING;DISABLE_SECURITY;FULL_AOT_INTERP;DISABLE_COM;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
<OutputPath>./../../class/lib/testing_aot_hybrid</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_hybrid</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_REMOTING;DISABLE_SECURITY;MOBILE_DYNAMIC;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
<OutputPath>./../../class/lib/testing_aot_full</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_full</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_REMOTING;DISABLE_SECURITY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_COM;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
<OutputPath>./../../class/lib/winaot</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-winaot</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_COM;WIN_PLATFORM;WINAOT;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'testing_winaot_interp' ">
<OutputPath>./../../class/lib/testing_winaot_interp</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_winaot_interp</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_COM;WIN_PLATFORM;WINAOT;FULL_AOT_INTERP;DISABLE_SECURITY;DISABLE_REMOTING;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'xammac' ">
<OutputPath>./../../class/lib/xammac</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-xammac</IntermediateOutputPath>
<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;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
<OutputPath>./../../class/lib/xammac_net_4_5</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-xammac_net_4_5</IntermediateOutputPath>
<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;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'orbis' ">
<OutputPath>./../../class/lib/orbis</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-orbis</IntermediateOutputPath>
<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_COM;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'unreal' ">
<OutputPath>./../../class/lib/unreal</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-unreal</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO;COREFX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'wasm' ">
<OutputPath>./../../class/lib/wasm</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-wasm</IntermediateOutputPath>
<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;WASM;DISABLE_COM;FEATURE_NO_BSD_SOCKETS;DISABLE_REMOTING;DISABLE_SECURITY;COREFX</DefineConstants>
</PropertyGroup>
<!-- @ALL_PROFILE_PROPERTIES@ -->
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
@@ -139,37 +69,14 @@
</ItemGroup>
<!--End of common files-->
<!-- @ALL_SOURCES@ -->
<ItemGroup>
<!-- @COMMON_PROJECT_REFERENCES@ -->
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
<ProjectReference Include="../System.Core/System.Core.csproj" />
<ProjectReference Include="../System/System.csproj" />
<ProjectReference Include="../System.Data/System.Data.csproj" />
<ProjectReference Include="../System.XML/System.Xml.csproj" />
<ProjectReference Include="../corlib/corlib.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
<Reference Include="nunitlite">
<HintPath>..\lib\testing_aot_full_interp\nunitlite.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
<Reference Include="nunitlite">
<HintPath>..\lib\testing_aot_hybrid\nunitlite.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
<Reference Include="nunitlite">
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'testing_winaot_interp' ">
<Reference Include="nunitlite">
<HintPath>..\lib\testing_winaot_interp\nunitlite.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<!-- @ALL_REFERENCES@ -->
<!-- @ALL_RESOURCES@ -->
<PropertyGroup>
@@ -3,7 +3,7 @@ SUBDIRS =
include ../../../../build/rules.make
LIBRARY = System.Data.Tests.Mainsoft.dll
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Data.dll /r:nunit.framework.dll /r:System.Xml.dll
LIB_MCS_FLAGS = /r:mscorlib.dll /r:System.dll /r:System.Data.dll /r:nunit.framework.dll /r:System.Xml.dll
NO_SIGN_ASSEMBLY = true
include ../../../../build/library.make
+40 -2
View File
@@ -234,8 +234,6 @@
<Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />
<Compile Include="System.Drawing\Bitmap.cs" />
<Compile Include="System.Drawing\Brushes.cs" />
<Compile Include="System.Drawing\BufferedGraphics.cs" />
<Compile Include="System.Drawing\BufferedGraphicsContext.cs" />
<Compile Include="System.Drawing\BufferedGraphicsManager.cs" />
<Compile Include="System.Drawing\CharacterRange.cs" />
<Compile Include="System.Drawing\ColorTranslator.cs" />
@@ -281,6 +279,46 @@
</ProjectReference>
</ItemGroup>
<!--End of common files-->
<!--Per-profile files-->
<Choose>
<When Condition="'$(Platform)' == 'net_4_x'">
<!--Per-host-platform files-->
<Choose>
<When Condition="'$(HostPlatform)' == 'win32'">
<ItemGroup>
<Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BufferedGraphics.Windows.cs" />
<Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BufferedGraphicsContext.Windows.cs" />
</ItemGroup>
</When>
<When Condition="'$(HostPlatform)' == 'unix'">
<ItemGroup>
<Compile Include="System.Drawing\BufferedGraphics.cs" />
<Compile Include="System.Drawing\BufferedGraphicsContext.cs" />
</ItemGroup>
</When>
<When Condition="'$(HostPlatform)' == 'macos'">
<ItemGroup>
<Compile Include="System.Drawing\BufferedGraphics.cs" />
<Compile Include="System.Drawing\BufferedGraphicsContext.cs" />
</ItemGroup>
</When>
<When Condition="'$(HostPlatform)' == 'linux'">
<ItemGroup>
<Compile Include="System.Drawing\BufferedGraphics.cs" />
<Compile Include="System.Drawing\BufferedGraphicsContext.cs" />
</ItemGroup>
</When>
</Choose>
<!--End of per-host-platform files-->
</When>
<Otherwise>
<ItemGroup>
<Compile Include="System.Drawing\BufferedGraphics.cs" />
<Compile Include="System.Drawing\BufferedGraphicsContext.cs" />
</ItemGroup>
</Otherwise>
</Choose>
<!--End of per-profile files-->
<!-- @ALL_SOURCES@ -->
<!-- @COMMON_PROJECT_REFERENCES@ -->
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
@@ -0,0 +1,2 @@
System.Drawing/BufferedGraphics.cs
System.Drawing/BufferedGraphicsContext.cs
@@ -0,0 +1,4 @@
#include System.Drawing.dll.sources
../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/BufferedGraphics.Windows.cs
../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/BufferedGraphicsContext.Windows.cs
@@ -12,10 +12,6 @@ namespace System.Net.Http
return true;
#endif
// Mono URI handling which does not distinguish between file and url absolute paths without scheme
if (uri.Scheme == Uri.UriSchemeFile && uri.OriginalString.StartsWith ("/", StringComparison.Ordinal))
return true;
return HttpUtilities.IsHttpUri (uri);
}
}
@@ -375,7 +375,8 @@ namespace MonoTests.System.Net.Http
Assert.AreEqual (response, client.SendAsync (request).Result, "#1");
}
[Test]
[Test]
[Category ("NotWorking")]
public void Send_BaseAddress ()
{
var mh = new HttpMessageHandlerMock ();
@@ -204,11 +204,9 @@ namespace System.Xml.Serialization
{
if (isNullable && ReadNull()) return null;
if (checkType)
{
System.Xml.XmlQualifiedName t = GetXsiType();
if (t != null)
{
if (checkType) {
System.Xml.XmlQualifiedName t = GetXsiType();
if (t != null) {
XmlTypeMapping realMap = typeMap.GetRealElementMap (t.Name, t.Namespace);
if (realMap == null) {
if (typeMap.TypeData.Type == typeof(object))
@@ -221,7 +219,12 @@ namespace System.Xml.Serialization
}
else if (typeMap.TypeData.Type == typeof(object))
return ReadTypedPrimitive (AnyType);
}
else {
XmlTypeMapping realMap = typeMap.GetRealElementMap (Reader.LocalName, Reader.NamespaceURI);
if (realMap != null && realMap != typeMap)
return ReadObject(realMap, false, false);
}
}
object ob = CreateInstance (typeMap.TypeData.Type, true);
@@ -389,7 +389,7 @@ namespace System.Xml.Serialization
return (XmlTypeMapMemberAttribute)_attributeMembers [BuildKey (name,ns, -1)];
}
public XmlTypeMapElementInfo GetElement(string name, string ns, int minimalOrder)
public XmlTypeMapElementInfo GetElement (string name, string ns, int minimalOrder)
{
if (_elements == null)
return null;
@@ -404,22 +404,38 @@ namespace System.Xml.Serialization
selected = info;
}
}
else if (info.MappedType != null && info.MappedType.DerivedTypes.Count > 0) {
foreach (XmlTypeMapping derrivedInfo in info.MappedType.DerivedTypes) {
if (derrivedInfo.ElementName == name && derrivedInfo.Namespace == ns) {
if (info.ExplicitOrder < minimalOrder)
continue;
if (selected == null || selected.ExplicitOrder > info.ExplicitOrder) {
selected = info;
}
}
}
}
}
return selected;
}
public XmlTypeMapElementInfo GetElement(string name, string ns)
public XmlTypeMapElementInfo GetElement (string name, string ns)
{
if (_elements == null) return null;
foreach (XmlTypeMapElementInfo info in _elements.Values)
if (info.ElementName == name && info.Namespace == ns)
return info;
else if (info.MappedType != null && info.MappedType.DerivedTypes.Count > 0) {
foreach (XmlTypeMapping derrivedInfo in info.MappedType.DerivedTypes)
if (derrivedInfo.ElementName == name && derrivedInfo.Namespace == ns)
return info;
}
return null;
}
public XmlTypeMapElementInfo GetElement (int index)
{
if (_elements == null) return null;
@@ -14,7 +14,6 @@
using System;
using System.Globalization;
using System.IO;
using System.Text;
using System.Xml;
using System.Xml.Serialization;
using NUnit.Framework;
@@ -1687,40 +1686,28 @@ namespace MonoTests.System.XmlSerialization
Assert.AreEqual ("b", d.Extra[1]);
}
// https://github.com/mono/mono/issues/16918
[Test]
public void Bug16918 ()
[Test] // PR #11194
public void TestDerrivedClassProperty ()
{
PropertiesWithSameNameAsTheirType testObject = new PropertiesWithSameNameAsTheirType ()
{
E1 = E1.Two,
E2 = E2.Two,
E3 = E3.Two,
E4 = E4.Two,
E5 = E5.Two
};
var data = "<layout width=\".25\" height =\".25\" x=\"0\" y=\"0\" id=\"portrait\" class=\"render\"><background color=\"white\"><div x=\".03\" y=\".05\" width=\".94\" height =\".9\" layout=\"proportional_rows\" paddingX=\".01\" paddingY=\".02\"><background color=\"black\"></background><background color=\"gray\" padding=\".1\"><label color=\"white\" font=\"emulogic.ttf\" fontSize=\"15\">Test UI</label></background><br brSize=\"1\" /><background class=\"back,Lab\" color=\"green\"><label class=\"Lab\" color=\"white\" font=\"emulogic.ttf\" fontSize=\"15\">GREEN</label></background><background color=\"red\"><label class=\"Lab\" color=\"white\" font=\"emulogic.ttf\" fontSize=\"15\">RED</label></background><background color=\"blue\"><label class=\"Lab\" color=\"white\" font=\"emulogic.ttf\" fontSize=\"15\">TLUE</label></background><background color=\"blue\"><label class=\"Lab\" color=\"white\" font=\"emulogic.ttf\" fontSize=\"15\">BLUE</label></background></div></background></layout>";
XmlSerializer serializer = new XmlSerializer (typeof (PropertiesWithSameNameAsTheirType));
XmlAttributeOverrides overrides = PR11194.GenerateLayoutOverrides<PR11194ChildLo>();
// serialize
string serializedObject;
using (MemoryStream memoryStream = new MemoryStream ())
{
serializer.Serialize (memoryStream, testObject);
serializedObject = Encoding.UTF8.GetString (memoryStream.ToArray ());
}
var result = Deserialize(typeof(PR11194ChildLo), data, overrides) as PR11194ChildLo;
PropertiesWithSameNameAsTheirType deserializedObject;
using (MemoryStream memoryStream = new MemoryStream (Encoding.UTF8.GetBytes (serializedObject)))
{
deserializedObject = (PropertiesWithSameNameAsTheirType)serializer.Deserialize (memoryStream);
}
Assert.AreEqual (testObject.E1, deserializedObject.E1, "#1");
Assert.AreEqual (testObject.E2, deserializedObject.E2, "#2");
Assert.AreEqual (testObject.E3, deserializedObject.E3, "#3");
Assert.AreEqual (testObject.E4, deserializedObject.E4, "#4");
Assert.AreEqual (testObject.E5, deserializedObject.E5, "#5");
PR11194Parent2 child;
Assert.IsNotNull(result, "#11194_1");
Assert.AreEqual(1, result.children.Count, "#11194_2");
child = result.children[0] as PR11194Parent2;
Assert.IsNotNull(child, "#11194_3");
Assert.AreEqual(1, child.children.Count, "#11194_4");
child = child.children[0] as PR11194Parent2;
Assert.IsNotNull(child, "#11194_5");
Assert.AreEqual(7, child.children.Count, "#11194_6");
child = child.children[1] as PR11194Parent2;
Assert.IsNotNull(child, "#11194_7");
Assert.AreEqual(1, child.children.Count, "#11194_8");
Assert.AreEqual("PR11194ChildL", child.children[0].GetType().Name, "#11194_9");
}
}
}
@@ -12,6 +12,8 @@
//
using System;
using System.Linq;
using System.Reflection;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
@@ -1205,54 +1207,157 @@ namespace MonoTests.System.Xml.TestClasses
}
}
[Serializable]
public class PropertiesWithSameNameAsTheirType
#region PR_11194
#region PR_11194_GenerateOverrides
public static class PR11194
{
public PropertiesWithSameNameAsTheirType ()
public static XmlAttributeOverrides GenerateLayoutOverrides<T>()
{
Type tType = typeof(T);
TypeInfo tTypeInfo = tType.GetTypeInfo();
IEnumerable<PropertyInfo> props = tType.GetRuntimeProperties();
XmlAttributeOverrides overrides = new XmlAttributeOverrides();
foreach (PropertyInfo prop in props) {
XmlDerrivedAttribute attr = prop.GetCustomAttribute<XmlDerrivedAttribute>();
if (attr == null) {
continue;
}
Type dType = prop.DeclaringType;
Type pType = prop.PropertyType;
TypeInfo pTypeInfo = pType.GetTypeInfo();
Type enumType = typeof(IEnumerable<>);
if (pTypeInfo.IsGenericType
&& pTypeInfo.ImplementedInterfaces.Any(t =>
(t.GetTypeInfo().IsGenericType && t.GetGenericTypeDefinition() == enumType))) {
pType = pType.GenericTypeArguments[0];
}
XmlAttributes overrideAttributes = GenerateOverrideAttributes(dType, pType, attr);
overrides.Add(dType, prop.Name, overrideAttributes);
}
return overrides;
}
public object obj1 { get; set; }
public object obj2 { get; set; }
public object obj3 { get; set; }
public object obj4 { get; set; }
public object obj5 { get; set; }
private static XmlAttributes GenerateOverrideAttributes (Type declaringType, Type propertyType, XmlDerrivedAttribute attr)
{
XmlAttributes xAttrs = new XmlAttributes();
public E1 E1 { get; set; }
public E2 E2 { get; set; }
public E3 E3 { get; set; }
public E4 E4 { get; set; }
public E5 E5 { get; set; }
Assembly a = declaringType.GetTypeInfo().Assembly;
TypeInfo interfaceType = propertyType.GetTypeInfo();
IEnumerable<Type> types = a.ExportedTypes.Where(t => interfaceType.IsAssignableFrom(t.GetTypeInfo()) && !t.GetTypeInfo().IsAbstract);
foreach (Type t in types) {
string name = NameBySourceType(t, attr.SrcType);// t.GetTypeInfo().GetCustomAttribute<XmlTypeAttribute>().TypeName;
XmlElementAttribute xAttr = new XmlElementAttribute();
xAttr.ElementName = name;
xAttr.Type = t;
xAttrs.XmlElements.Add(xAttr);
}
return xAttrs;
}
private static string NameBySourceType (Type derrivedType, XmlDerrivedSourceType srcType)
{
string name = null;
switch (srcType)
{
case XmlDerrivedSourceType.ByXmlType:
name = derrivedType.GetTypeInfo().GetCustomAttribute<XmlTypeAttribute>().TypeName;
break;
}
return name;
}
}
#endregion
public enum E1
#region helperAttribute
public enum XmlDerrivedSourceType
{
One,
Two,
ByXmlType
}
public enum E2
public class XmlDerrivedAttribute : Attribute
{
One,
Two,
public XmlDerrivedSourceType SrcType { get; set; }
public XmlDerrivedAttribute(XmlDerrivedSourceType srcType)
{
SrcType = srcType;
}
}
#endregion
public abstract class PR11194Parent
{
[XmlIgnore]
public PR11194Parent Parent { get; set; }
}
public enum E5
public abstract class PR11194Parent2 : PR11194Parent
{
One,
Two,
[XmlAttribute]
public float width { get; set; }
[XmlAttribute]
public float height { get; set; }
[XmlAttribute]
public float x { get; set; }
[XmlAttribute]
public float y { get; set; }
[XmlAttribute]
public string id { get; set; }
[XmlElement]
[XmlDerrived(XmlDerrivedSourceType.ByXmlType)]
public List<PR11194Parent> children { get; set; }
}
public enum E3
[XmlType("background")]
public class PR11194ChildB : PR11194Parent2
{
One,
Two,
[XmlAttribute]
public string image { get; set; }
}
public enum E4
[XmlType("br")]
public class PR11194ChildBr : PR11194Parent
{
One,
Two,
[XmlAttribute("brSize")]
public int breaks { get; set; }
}
[XmlType("div")]
public class PR11194ChildD : PR11194ChildLo
{
}
[XmlType("label")]
public class PR11194ChildL : PR11194Parent2
{
[XmlAttribute]
public string font { get; set; }
[XmlAttribute]
public int fontSize { get; set; }
[XmlText]
public string Text { get; set; }
}
[XmlType("layout")]
public class PR11194ChildLo : PR11194Parent2
{
}
#endregion
}
@@ -140,15 +140,12 @@ namespace System.IO.Compression
internal ValueTask<int> ReadAsyncMemory (Memory<byte> destination, CancellationToken cancellationToken)
{
return base.ReadAsync(destination, cancellationToken);
throw new NotImplementedException ();
}
internal int ReadCore (Span<byte> destination)
{
var buffer = new byte [destination.Length];
int count = Read(buffer, 0, buffer.Length);
buffer.AsSpan(0, count).CopyTo(destination);
return count;
throw new NotImplementedException ();
}
public override int Read (byte[] array, int offset, int count)
@@ -183,12 +180,12 @@ namespace System.IO.Compression
internal ValueTask WriteAsyncMemory (ReadOnlyMemory<byte> source, CancellationToken cancellationToken)
{
return base.WriteAsync(source, cancellationToken);
throw new NotImplementedException ();
}
internal void WriteCore (ReadOnlySpan<byte> source)
{
Write (source.ToArray (), 0, source.Length);
throw new NotImplementedException ();
}
public override void Write (byte[] array, int offset, int count)
@@ -0,0 +1,75 @@
//
// System.IO.FileSystemEventArgs.cs
//
// Author:
// Tim Coleman ([email protected])
//
// Copyright (C) Tim Coleman, 2002
//
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace System.IO {
public class FileSystemEventArgs : EventArgs {
#region Fields
WatcherChangeTypes changeType;
string directory;
string name;
#endregion // Fields
#region Constructors
public FileSystemEventArgs (WatcherChangeTypes changeType, string directory, string name)
{
this.changeType = changeType;
this.directory = directory;
this.name = name;
}
internal void SetName (string name)
{
this.name = name;
}
#endregion // Constructors
#region Properties
public WatcherChangeTypes ChangeType {
get { return changeType; }
}
public string FullPath {
get { return Path.Combine (directory, name); }
}
public string Name {
get { return name; }
}
#endregion // Properties
}
}
@@ -0,0 +1,33 @@
//
// System.IO.FileSystemEventHandler.cs
//
// Author:
// Tim Coleman ([email protected])
//
// Copyright (C) Tim Coleman, 2002
// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
namespace System.IO {
public delegate void FileSystemEventHandler (object sender, FileSystemEventArgs e);
}
@@ -61,7 +61,7 @@ namespace System.IO {
SearchPattern2 pattern;
bool disposed;
string mangledFilter;
IFileWatcher watcher;
static IFileWatcher watcher;
object watcher_handle;
static object lockobj = new object ();
@@ -38,8 +38,6 @@ namespace System.Net.NetworkInformation {
public const int AF_INET = 2;
public const int AF_INET6 = 23;
// FIXME: it might be getting wrong table. I'm getting
// different results from .NET 2.0.
unsafe void FillTcpTable (out List<Win32_MIB_TCPROW> tab4, out List<Win32_MIB_TCP6ROW> tab6)
{
tab4 = new List<Win32_MIB_TCPROW> ();
@@ -305,16 +303,16 @@ namespace System.Net.NetworkInformation {
{
public TcpState State;
public uint LocalAddr;
public int LocalPort;
public uint LocalPort;
public uint RemoteAddr;
public int RemotePort;
public uint RemotePort;
public IPEndPoint LocalEndPoint {
get { return new IPEndPoint (LocalAddr, LocalPort); }
get { return new IPEndPoint (LocalAddr, ntohs((ushort)LocalPort)); }
}
public IPEndPoint RemoteEndPoint {
get { return new IPEndPoint (RemoteAddr, RemotePort); }
get { return new IPEndPoint (RemoteAddr, ntohs((ushort)RemotePort)); }
}
public TcpConnectionInformation TcpInfo {
@@ -328,17 +326,17 @@ namespace System.Net.NetworkInformation {
public TcpState State;
public Win32_IN6_ADDR LocalAddr;
public uint LocalScopeId;
public int LocalPort;
public uint LocalPort;
public Win32_IN6_ADDR RemoteAddr;
public uint RemoteScopeId;
public int RemotePort;
public uint RemotePort;
public IPEndPoint LocalEndPoint {
get { return new IPEndPoint (new IPAddress (LocalAddr.Bytes, LocalScopeId), LocalPort); }
get { return new IPEndPoint (new IPAddress (LocalAddr.Bytes, LocalScopeId), ntohs((ushort)LocalPort)); }
}
public IPEndPoint RemoteEndPoint {
get { return new IPEndPoint (new IPAddress (RemoteAddr.Bytes, RemoteScopeId), RemotePort); }
get { return new IPEndPoint (new IPAddress (RemoteAddr.Bytes, RemoteScopeId), ntohs((ushort)RemotePort)); }
}
public TcpConnectionInformation TcpInfo {
@@ -362,10 +360,10 @@ namespace System.Net.NetworkInformation {
{
public Win32_IN6_ADDR LocalAddr;
public uint LocalScopeId;
public int LocalPort;
public uint LocalPort;
public IPEndPoint LocalEndPoint {
get { return new IPEndPoint (new IPAddress (LocalAddr.Bytes, LocalScopeId), LocalPort); }
get { return new IPEndPoint (new IPAddress (LocalAddr.Bytes, LocalScopeId), ntohs((ushort)LocalPort)); }
}
}
}
+56 -34
View File
@@ -608,15 +608,15 @@ namespace System.Net.Sockets
throw new InvalidOperationException ("No operation in progress");
try {
e.AcceptSocket = e.current_socket.EndAccept (ares);
e.AcceptSocket = e.CurrentSocket.EndAccept (ares);
} catch (SocketException ex) {
e.SocketError = ex.SocketErrorCode;
} catch (ObjectDisposedException) {
e.SocketError = SocketError.OperationAborted;
} finally {
if (e.AcceptSocket == null)
e.AcceptSocket = new Socket (e.current_socket.AddressFamily, e.current_socket.SocketType, e.current_socket.ProtocolType, null);
e.Complete ();
e.AcceptSocket = new Socket (e.CurrentSocket.AddressFamily, e.CurrentSocket.SocketType, e.CurrentSocket.ProtocolType, null);
e.Complete_internal ();
}
});
@@ -959,7 +959,7 @@ namespace System.Net.Sockets
*
* Note that we're not calling `e.Complete ()` (or resetting `e.in_progress`) here.
*/
e.current_socket.EndConnect (ares);
e.CurrentSocket.EndConnect (ares);
}
return pending;
@@ -979,7 +979,7 @@ namespace System.Net.Sockets
throw new ArgumentNullException("e");
if (e.in_progress != 0 && e.LastOperation == SocketAsyncOperation.Connect)
e.current_socket?.Close ();
e.CurrentSocket?.Close ();
}
static AsyncCallback ConnectAsyncCallback = new AsyncCallback (ares => {
@@ -989,17 +989,17 @@ namespace System.Net.Sockets
throw new InvalidOperationException ("No operation in progress");
try {
e.current_socket.EndConnect (ares);
e.CurrentSocket.EndConnect (ares);
} catch (SocketException se) {
e.SocketError = se.SocketErrorCode;
} catch (ObjectDisposedException) {
e.SocketError = SocketError.OperationAborted;
} finally {
e.Complete ();
e.Complete_internal ();
}
});
public IAsyncResult BeginConnect (string host, int port, AsyncCallback callback, object state)
public IAsyncResult BeginConnect (string host, int port, AsyncCallback requestCallback, object state)
{
ThrowIfDisposedAndClosed ();
@@ -1012,23 +1012,32 @@ namespace System.Net.Sockets
if (is_listening)
throw new InvalidOperationException ();
var sockares = new SocketAsyncResult (this, callback, state, SocketOperation.Connect) {
Port = port
};
var callback = new AsyncCallback ((result) => {
var resultTask = ((Task<IPAddress[]>)result);
BeginConnect (resultTask.Result, port, requestCallback, resultTask.AsyncState);
});
return ConvertToApm<IPAddress[]> (Dns.GetHostAddressesAsync (host), callback, state);
}
var dnsRequest = Dns.GetHostAddressesAsync (host);
dnsRequest.ContinueWith (t => {
private static IAsyncResult ConvertToApm<T> (Task<T> task, AsyncCallback callback, object state)
{
if (task == null)
throw new ArgumentNullException ("task");
var tcs = new TaskCompletionSource<T> (state);
task.ContinueWith (t =>
{
if (t.IsFaulted)
sockares.Complete (t.Exception.InnerException);
tcs.TrySetException (t.Exception.InnerExceptions);
else if (t.IsCanceled)
sockares.Complete (new OperationCanceledException ());
else {
sockares.Addresses = t.Result;
BeginMConnect (sockares);
}
}, TaskScheduler.Default);
tcs.TrySetCanceled ();
else
tcs.TrySetResult (t.Result);
return sockares;
if (callback != null)
callback (tcs.Task);
}, TaskScheduler.Default);
return tcs.Task;
}
public IAsyncResult BeginConnect (EndPoint remoteEP, AsyncCallback callback, object state)
@@ -1254,7 +1263,7 @@ namespace System.Net.Sockets
Array.Resize (ref addresses, last_valid);
return true;
} else {
e.ConnectByNameError = null;
e.SetConnectByNameError (null);
return false;
}
}
@@ -1307,13 +1316,13 @@ namespace System.Net.Sockets
throw new InvalidOperationException ("No operation in progress");
try {
e.current_socket.EndDisconnect (ares);
e.CurrentSocket.EndDisconnect (ares);
} catch (SocketException ex) {
e.SocketError = ex.SocketErrorCode;
} catch (ObjectDisposedException) {
e.SocketError = SocketError.OperationAborted;
} finally {
e.Complete ();
e.Complete_internal ();
}
});
@@ -1506,13 +1515,13 @@ namespace System.Net.Sockets
throw new InvalidOperationException ("No operation in progress");
try {
e.BytesTransferred = e.current_socket.EndReceive (ares);
e.SetBytesTransferred (e.CurrentSocket.EndReceive (ares));
} catch (SocketException se){
e.SocketError = se.SocketErrorCode;
} catch (ObjectDisposedException) {
e.SocketError = SocketError.OperationAborted;
} finally {
e.Complete ();
e.Complete_internal ();
}
});
@@ -1730,13 +1739,13 @@ namespace System.Net.Sockets
throw new InvalidOperationException ("No operation in progress");
try {
e.BytesTransferred = e.current_socket.EndReceiveFrom (ares, ref e.remote_ep);
e.SetBytesTransferred (e.CurrentSocket.EndReceiveFrom_internal ((SocketAsyncResult)ares, e));
} catch (SocketException ex) {
e.SocketError = ex.SocketErrorCode;
} catch (ObjectDisposedException) {
e.SocketError = SocketError.OperationAborted;
} finally {
e.Complete ();
e.Complete_internal ();
}
});
@@ -1801,7 +1810,20 @@ namespace System.Net.Sockets
return sockares.Total;
}
int EndReceiveFrom_internal (SocketAsyncResult sockares, SocketAsyncEventArgs ares)
{
ThrowIfDisposedAndClosed ();
if (Interlocked.CompareExchange (ref sockares.EndCalled, 1, 0) == 1)
throw new InvalidOperationException ("EndReceiveFrom can only be called once per asynchronous operation");
if (!sockares.IsCompleted)
sockares.AsyncWaitHandle.WaitOne ();
sockares.CheckIfThrowDelayedException ();
ares.RemoteEndPoint = sockares.EndPoint;
return sockares.Total;
}
static unsafe int ReceiveFrom_internal (SafeSocketHandle safeHandle, byte* buffer, int count, SocketFlags flags, ref SocketAddress sockaddr, out int error, bool blocking)
{
@@ -1996,13 +2018,13 @@ namespace System.Net.Sockets
throw new InvalidOperationException ("No operation in progress");
try {
e.BytesTransferred = e.current_socket.EndSend (ares);
e.SetBytesTransferred (e.CurrentSocket.EndSend (ares));
} catch (SocketException se){
e.SocketError = se.SocketErrorCode;
} catch (ObjectDisposedException) {
e.SocketError = SocketError.OperationAborted;
} finally {
e.Complete ();
e.Complete_internal ();
}
});
@@ -2220,13 +2242,13 @@ namespace System.Net.Sockets
throw new InvalidOperationException ("No operation in progress");
try {
e.BytesTransferred = e.current_socket.EndSendTo (ares);
e.SetBytesTransferred (e.CurrentSocket.EndSendTo (ares));
} catch (SocketException ex) {
e.SocketError = ex.SocketErrorCode;
} catch (ObjectDisposedException) {
e.SocketError = SocketError.OperationAborted;
} finally {
e.Complete ();
e.Complete_internal ();
}
});
@@ -2857,10 +2879,10 @@ namespace System.Net.Sockets
if (e.AcceptSocket != null) {
e.socket_async_result.AcceptSocket = e.AcceptSocket;
}
e.current_socket = this;
e.SetCurrentSocket (this);
e.SetLastOperation (SocketOperationToSocketAsyncOperation (operation));
e.SocketError = SocketError.Success;
e.BytesTransferred = 0;
e.SetBytesTransferred (0);
}
SocketAsyncOperation SocketOperationToSocketAsyncOperation (SocketOperation op)
@@ -41,14 +41,14 @@ namespace System.Net.Sockets
bool disposed;
internal volatile int in_progress;
internal EndPoint remote_ep;
internal Socket current_socket;
EndPoint remote_ep;
Socket current_socket;
internal SocketAsyncResult socket_async_result = new SocketAsyncResult ();
public Exception ConnectByNameError {
get;
internal set;
private set;
}
public Socket AcceptSocket {
@@ -63,7 +63,7 @@ namespace System.Net.Sockets
public Memory<byte> MemoryBuffer => Buffer;
internal IList<ArraySegment<byte>> m_BufferList;
IList<ArraySegment<byte>> m_BufferList;
public IList<ArraySegment<byte>> BufferList {
get { return m_BufferList; }
set {
@@ -75,12 +75,12 @@ namespace System.Net.Sockets
public int BytesTransferred {
get;
internal set;
private set;
}
public int Count {
get;
internal set;
private set;
}
public bool DisconnectReuseSocket {
@@ -150,19 +150,8 @@ namespace System.Net.Sockets
}
}
internal bool PolicyRestricted {
get;
private set;
}
public event EventHandler<SocketAsyncEventArgs> Completed;
internal SocketAsyncEventArgs (bool policy)
: this ()
{
PolicyRestricted = policy;
}
public SocketAsyncEventArgs ()
{
SendPacketsSendSize = -1;
@@ -187,6 +176,25 @@ namespace System.Net.Sockets
GC.SuppressFinalize (this);
}
internal void SetConnectByNameError (Exception error)
{
ConnectByNameError = error;
}
internal void SetBytesTransferred (int value)
{
BytesTransferred = value;
}
internal Socket CurrentSocket {
get { return current_socket; }
}
internal void SetCurrentSocket (Socket socket)
{
current_socket = socket;
}
internal void SetLastOperation (SocketAsyncOperation op)
{
if (disposed)
@@ -197,7 +205,7 @@ namespace System.Net.Sockets
LastOperation = op;
}
internal void Complete ()
internal void Complete_internal ()
{
in_progress = 0;
OnCompleted (this);
@@ -269,7 +277,7 @@ namespace System.Net.Sockets
if (current_socket != null)
current_socket.is_connected = false;
Complete ();
Complete_internal ();
}
internal void FinishOperationAsyncFailure (Exception exception, int bytesTransferred, SocketFlags flags)
@@ -279,7 +287,7 @@ namespace System.Net.Sockets
if (current_socket != null)
current_socket.is_connected = false;
Complete ();
Complete_internal ();
}
internal void FinishWrapperConnectSuccess (Socket connectSocket, int bytesTransferred, SocketFlags flags)
@@ -287,7 +295,7 @@ namespace System.Net.Sockets
SetResults(SocketError.Success, bytesTransferred, flags);
current_socket = connectSocket;
Complete ();
Complete_internal ();
}
internal void SetResults (SocketError socketError, int bytesTransferred, SocketFlags flags)
+6 -6
View File
@@ -27,12 +27,12 @@
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;COREFX;CONFIGURATION_2_0;SYSTEM_NET_PRIMITIVES_DLL;XML_DEP;SECURITY_DEP;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;MONO_SECURITY_ALIAS;CODEDOM;FEATURE_COMPILED;MONO_FEATURE_BTLS;ENABLE_GSS;CONFIGURATION_DEP</DefineConstants>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;COREFX;CONFIGURATION_2_0;SYSTEM_NET_PRIMITIVES_DLL;XML_DEP;SECURITY_DEP;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;MONO_SECURITY_ALIAS;CODEDOM;FEATURE_COMPILED;MONO_FEATURE_BTLS;CONFIGURATION_DEP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
<OutputPath>./../../class/lib/monodroid</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monodroid</IntermediateOutputPath>
<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;COREFX;CONFIGURATION_2_0;SYSTEM_NET_PRIMITIVES_DLL;XML_DEP;SECURITY_DEP;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;MONO_SECURITY_ALIAS;FEATURE_COMPILED;MONO_FEATURE_BTLS;ENABLE_GSS</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;COREFX;CONFIGURATION_2_0;SYSTEM_NET_PRIMITIVES_DLL;XML_DEP;SECURITY_DEP;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;MONO_SECURITY_ALIAS;FEATURE_COMPILED;MONO_FEATURE_BTLS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monotouch' ">
<OutputPath>./../../class/lib/monotouch</OutputPath>
@@ -412,11 +412,7 @@
<Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionLevel.cs" />
<Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionMode.cs" />
<Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\GZipStream.cs" />
<Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemEventArgs.cs" />
<Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemEventHandler.cs" />
<Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.cs" />
<Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\RenamedEventArgs.cs" />
<Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\RenamedEventHandler.cs" />
<Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\WaitForChangedResult.cs" />
<Compile Include="..\..\..\external\corefx\src\System.Net.Mail\src\System\Net\Base64Stream.cs" />
<Compile Include="..\..\..\external\corefx\src\System.Net.Mail\src\System\Net\BufferBuilder.cs" />
@@ -870,10 +866,14 @@
<Compile Include="System.IO.Compression\DeflateStream.cs" />
<Compile Include="System.IO\ErrorEventArgs.cs" />
<Compile Include="System.IO\ErrorEventHandler.cs" />
<Compile Include="System.IO\FileSystemEventArgs.cs" />
<Compile Include="System.IO\FileSystemEventHandler.cs" />
<Compile Include="System.IO\IODescriptionAttribute.cs" />
<Compile Include="System.IO\InternalBufferOverflowException.cs" />
<Compile Include="System.IO\InvalidDataException.cs" />
<Compile Include="System.IO\NotifyFilters.cs" />
<Compile Include="System.IO\RenamedEventArgs.cs" />
<Compile Include="System.IO\RenamedEventHandler.cs" />
<Compile Include="System.IO\WatcherChangeTypes.cs" />
<Compile Include="System.Net.Mail\AlternateView.cs" />
<Compile Include="System.Net.Mail\AlternateViewCollection.cs" />
@@ -110,9 +110,6 @@ System/RemoteExecutorTests.cs
# System.IO.FileSystemWatcher
../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/Utility/*.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/Args.ErrorEventArgs.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/Args.FileSystemEventArgs.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/Args.RenamedEventArgs.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.unit.cs
../../../external/corefx/src/Common/tests/System/IO/TempFile.cs
@@ -11,7 +11,6 @@
using NUnit.Framework;
using System;
using System.IO;
using System.Reflection;
using MonoTests.Helpers;
@@ -110,72 +109,7 @@ namespace MonoTests.System.IO
}
}
}
[Test]
public void CreateTwoAndDispose ()
{
// Create two FSW instances and dispose them. Verify
// that the backend IFileWatcher's Dispose
// (watcher_handle) method got called.
// FIXME: This only works for the
// CoreFXFileSystemWatcherProxy not the other backends.
using (var tmp = new TempDirectory ()) {
// have to use reflection to poke at the private fields of FileSystemWatcher.
var watcherField = typeof (FileSystemWatcher).GetField ("watcher", BindingFlags.Instance | BindingFlags.NonPublic);
Assert.IsNotNull (watcherField);
var watcherHandleField = typeof (FileSystemWatcher).GetField ("watcher_handle", BindingFlags.Instance | BindingFlags.NonPublic);
Assert.IsNotNull (watcherHandleField);
var proxyType = typeof (FileSystemWatcher).Assembly.GetType ("System.IO.CoreFXFileSystemWatcherProxy");
Assert.IsNotNull (proxyType);
var fsw1 = new FileSystemWatcher (tmp.Path, "*");
var fsw2 = new FileSystemWatcher (tmp.Path, "*");
object handle1 = null;
object handle2 = null;
// using "using" to ensure that Dispose gets called even if we throw an exception
using (var fsw11 = fsw1)
using (var fsw22 = fsw2) {
// at this point watcher and watcher_handle should be set
var watcher = watcherField.GetValue (fsw1);
Assert.IsNotNull (watcher);
if (!proxyType.IsAssignableFrom (watcher.GetType ()))
Assert.Ignore ("Testing only CoreFXFileSystemWatcherProxy FSW backend");
handle1 = watcherHandleField.GetValue (fsw1);
handle2 = watcherHandleField.GetValue (fsw2);
Assert.IsNotNull (handle1);
Assert.IsNotNull (handle2);
}
// Dispose was called, now watcher_handle should be null
Assert.IsNull (watcherHandleField.GetValue (fsw1));
Assert.IsNull (watcherHandleField.GetValue (fsw2));
// and moreover, the CoreFXFileSystemWatcherProxy shouldn't have entries for either handle1 or handle2
var proxyTypeInternalMapField = proxyType.GetField ("internal_map", BindingFlags.Static | BindingFlags.NonPublic);
Assert.IsNotNull (proxyTypeInternalMapField);
var internal_map = proxyTypeInternalMapField.GetValue (null)
as global::System.Collections.Generic.IDictionary<object, global::System.IO.CoreFX.FileSystemWatcher>;
Assert.IsNotNull (internal_map);
// This pair are the critical checks: after we call Dispose on fsw1 and fsw2, the
// backend's internal map shouldn't have anything keyed on handle1 and handle2.
// Therefore System.IO.CoreFX.FileSystemWatcher instances will be disposed of, too.
Assert.IsFalse (internal_map.ContainsKey (handle1));
Assert.IsFalse (internal_map.ContainsKey (handle2));
}
}
}
}
#endif
#endif
@@ -511,7 +511,7 @@ namespace MonoTests.System.Net.Sockets
sock.BeginConnect (ep, new AsyncCallback(SocketError_callback),
sock);
if (SocketError_event.WaitOne (5000, false) == false) {
if (SocketError_event.WaitOne (2000, false) == false) {
Assert.Fail ("SocketError wait timed out");
}
@@ -1715,68 +1715,6 @@ namespace MonoTests.System.Net.Sockets
listen.Close ();
}
[Test]
#if FEATURE_NO_BSD_SOCKETS
[ExpectedException (typeof (PlatformNotSupportedException))]
#endif
public void BeginConnectHostNamePortWithoutCallback ()
{
Socket sock = new Socket (AddressFamily.InterNetwork,
SocketType.Stream,
ProtocolType.Tcp);
Socket listen = new Socket (AddressFamily.InterNetwork,
SocketType.Stream,
ProtocolType.Tcp);
listen.Bind (IPAddress.Loopback, out IPEndPoint ep);
listen.Listen (1);
IAsyncResult result = sock.BeginConnect (IPAddress.Loopback.ToString (), ep.Port, null, null);
if (result.AsyncWaitHandle.WaitOne (2000, false) == false) {
Assert.Fail ("BeginConnectHostNamePortWithoutCallback wait timed out");
}
Assert.AreEqual (true, result.IsCompleted, "BeginConnectHostNamePortWithoutCallback #1");
sock.EndConnect (result);
sock.Close ();
listen.Close ();
}
[Test]
#if FEATURE_NO_BSD_SOCKETS
[ExpectedException (typeof (PlatformNotSupportedException))]
#endif
public void BeginConnectHostNamePortWithCallback ()
{
Socket sock = new Socket (AddressFamily.InterNetwork,
SocketType.Stream,
ProtocolType.Tcp);
Socket listen = new Socket (AddressFamily.InterNetwork,
SocketType.Stream,
ProtocolType.Tcp);
listen.Bind (IPAddress.Loopback, out IPEndPoint ep);
listen.Listen (1);
BCCalledBack.Reset ();
BCConnected = false;
IAsyncResult result = sock.BeginConnect (IPAddress.Loopback.ToString (), ep.Port, BCCallback, sock);
if (BCCalledBack.WaitOne (2000, false) == false) {
Assert.Fail ("BeginConnectHostNamePortWithCallback wait timed out");
}
Assert.AreEqual (true, BCConnected, "BeginConnectHostNamePortWithCallback #1");
sock.Close ();
listen.Close ();
}
[Test]
#if FEATURE_NO_BSD_SOCKETS
[ExpectedException (typeof (PlatformNotSupportedException))]
@@ -16,7 +16,7 @@ namespace MonoTests.System.Net.WebSockets
[TestFixture]
public class ClientWebSocketTest
{
const string EchoServerUrl = "ws://corefx-net-http11.azurewebsites.net/WebSocket/EchoWebSocket.ashx";
const string EchoServerUrl = "ws://corefx-net.cloudapp.net/WebSocket/EchoWebSocket.ashx";
ClientWebSocket socket;
MethodInfo headerSetMethod;
+5 -5
View File
@@ -28,10 +28,14 @@ System.IO.Compression/DeflateStream.cs
System.IO/ErrorEventArgs.cs
System.IO/ErrorEventHandler.cs
System.IO/FileSystemEventArgs.cs
System.IO/FileSystemEventHandler.cs
System.IO/InternalBufferOverflowException.cs
System.IO/InvalidDataException.cs
System.IO/IODescriptionAttribute.cs
System.IO/NotifyFilters.cs
System.IO/RenamedEventArgs.cs
System.IO/RenamedEventHandler.cs
System.IO/WatcherChangeTypes.cs
System.Net/BasicClient.cs
@@ -868,17 +872,13 @@ ReferenceSources/Win32Exception.cs
../../../external/corefx/src/System.Private.Uri/src/System/UriBuilder.cs
../../../external/corefx/src/System.Runtime.Extensions/src/System/CodeDom/Compiler/IndentedTextWriter.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemEventArgs.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemEventHandler.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/RenamedEventArgs.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/RenamedEventHandler.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/WaitForChangedResult.cs
../../../external/corefx/src/System.Runtime.InteropServices/src/System/Security/SecureStringMarshal.cs
../../../external/corefx/src/System.Runtime.Extensions/src/System/StringNormalizationExtensions.cs
../../../external/corefx/src/System.Diagnostics.StackTrace/src/System/Diagnostics/StackFrameExtensions.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs
# Everything except compiled
../../../external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Capture.cs
+6 -3
View File
@@ -232,7 +232,7 @@ TEST_RESOURCES = $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE)
satellite_assembly1 = $(test_lib_dir)/es-ES/$(patsubst %.dll,%.resources.dll,$(test_lib))
satellite_assembly2 = $(test_lib_dir)/nn-NO/$(patsubst %.dll,%.resources.dll,$(test_lib))
$(test_lib_output): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2) | $(test_lib_dir)
$(test_lib_output): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2) $(test_lib_dir)
mscorlib_for_profile = $(topdir)/class/lib/$(PROFILE)/mscorlib.dll
@@ -298,8 +298,11 @@ NO_VTS_TEST = yes
endif
ifndef NO_VTS_TEST
test-local: test-vts
run-test-local: run-test-vts
test: test-vts
run-test: run-test-vts
else
test:
run-test:
endif
EXTRA_DISTFILES += \
+4 -11
View File
@@ -100,7 +100,7 @@ namespace Mono {
static extern void DisableMicrosoftTelemetry ();
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern void EnableMicrosoftTelemetry_internal (IntPtr appBundleID, IntPtr appSignature, IntPtr appVersion, IntPtr merpGUIPath, IntPtr appPath, IntPtr configDir);
static extern void EnableMicrosoftTelemetry_internal (IntPtr appBundleID, IntPtr appSignature, IntPtr appVersion, IntPtr merpGUIPath, IntPtr eventType, IntPtr appPath, IntPtr configDir);
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern void SendMicrosoftTelemetry_internal (IntPtr payload, ulong portable_hash, ulong unportable_hash);
@@ -148,17 +148,18 @@ namespace Mono {
}
// All must be set except for configDir_str
static void EnableMicrosoftTelemetry (string appBundleID_str, string appSignature_str, string appVersion_str, string merpGUIPath_str, string unused /* eventType_str */, string appPath_str, string configDir_str)
static void EnableMicrosoftTelemetry (string appBundleID_str, string appSignature_str, string appVersion_str, string merpGUIPath_str, string eventType_str, string appPath_str, string configDir_str)
{
if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
using (var appBundleID_chars = RuntimeMarshal.MarshalString (appBundleID_str))
using (var appSignature_chars = RuntimeMarshal.MarshalString (appSignature_str))
using (var appVersion_chars = RuntimeMarshal.MarshalString (appVersion_str))
using (var merpGUIPath_chars = RuntimeMarshal.MarshalString (merpGUIPath_str))
using (var eventType_chars = RuntimeMarshal.MarshalString (eventType_str))
using (var appPath_chars = RuntimeMarshal.MarshalString (appPath_str))
using (var configDir_chars = RuntimeMarshal.MarshalString (configDir_str))
{
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value, appPath_chars.Value, configDir_chars.Value);
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value, eventType_chars.Value, appPath_chars.Value, configDir_chars.Value);
}
} else {
throw new PlatformNotSupportedException("Merp support is currently only supported on OSX.");
@@ -192,14 +193,6 @@ namespace Mono {
return new Tuple<String, ulong, ulong> (payload_str, portable_hash, unportable_hash);
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern void RegisterReportingForAllNativeLibs_internal ();
static void RegisterReportingForAllNativeLibs ()
{
RegisterReportingForAllNativeLibs_internal ();
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern void RegisterReportingForNativeLib_internal (IntPtr modulePathSuffix, IntPtr moduleName);
+1 -1
View File
@@ -93,7 +93,7 @@ namespace System
dst += int.MaxValue;
}
memcpy1 (dst, src, (int) sourceBytesToCopy);
Memcpy (dst, src, (int) sourceBytesToCopy);
}
[CLSCompliantAttribute (false)]
@@ -34,36 +34,6 @@ namespace System.Globalization
[StructLayout (LayoutKind.Sequential)]
partial class CalendarData
{
private static string[] HEBREW_MONTH_NAMES = new[] {
"\u05EA\u05E9\u05E8\u05D9",
"\u05D7\u05E9\u05D5\u05DF",
"\u05DB\u05E1\u05DC\u05D5",
"\u05D8\u05D1\u05EA",
"\u05E9\u05D1\u05D8",
"\u05D0\u05D3\u05E8",
"\u05D0\u05D3\u05E8\u0020\u05D1",
"\u05E0\u05D9\u05E1\u05DF",
"\u05D0\u05D9\u05D9\u05E8",
"\u05E1\u05D9\u05D5\u05DF",
"\u05EA\u05DE\u05D5\u05D6",
"\u05D0\u05D1",
"\u05D0\u05DC\u05D5\u05DC" };
private static string[] HEBREW_LEAP_MONTH_NAMES = new[] {
"\u05EA\u05E9\u05E8\u05D9",
"\u05D7\u05E9\u05D5\u05DF",
"\u05DB\u05E1\u05DC\u05D5",
"\u05D8\u05D1\u05EA",
"\u05E9\u05D1\u05D8",
"\u05D0\u05D3\u05E8\u0020\u05D0",
"\u05D0\u05D3\u05E8\u0020\u05D1",
"\u05E0\u05D9\u05E1\u05DF",
"\u05D0\u05D9\u05D9\u05E8",
"\u05E1\u05D9\u05D5\u05DF",
"\u05EA\u05DE\u05D5\u05D6",
"\u05D0\u05D1",
"\u05D0\u05DC\u05D5\u05DC" };
public static int nativeGetTwoDigitYearMax (int calID)
{
// -1 mean OS does not override default BCL max year
@@ -73,17 +43,7 @@ namespace System.Globalization
static bool nativeGetCalendarData (CalendarData data, string localeName, int calendarId)
{
// TODO: Convert calendar-id to mono runtime calendar-id when it's used
if (data.fill_calendar_data (localeName.ToLowerInvariant (), calendarId)) {
if ((CalendarId)calendarId == CalendarId.HEBREW) {
// HACK: Generate leap month names because the native code does not do it
// and tests would fail to round-trip dates on leap years.
// https://github.com/mono/mono/issues/16623
data.saMonthNames = HEBREW_MONTH_NAMES;
data.saLeapYearMonthNames = HEBREW_LEAP_MONTH_NAMES;
}
return true;
}
return false;
return data.fill_calendar_data (localeName.ToLowerInvariant (), calendarId);
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]
-15
View File
@@ -433,21 +433,6 @@ namespace System.IO
}
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]
private extern static bool Cancel_internal (IntPtr handle, out MonoIOError error);
internal static bool Cancel (SafeHandle safeHandle, out MonoIOError error)
{
bool release = false;
try {
safeHandle.DangerousAddRef (ref release);
return Cancel_internal (safeHandle.DangerousGetHandle (), out error);
} finally {
if (release)
safeHandle.DangerousRelease ();
}
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]
public extern static bool Close (IntPtr handle,
out MonoIOError error);
+2 -2
View File
@@ -75,8 +75,8 @@ namespace System.IO
ERROR_SHARING_BUFFER_EXCEEDED = 36,
ERROR_HANDLE_EOF = 38,
*/ ERROR_HANDLE_DISK_FULL = 39,
ERROR_NOT_SUPPORTED = 50,
/* ERROR_REM_NOT_LIST = 51,
/* ERROR_NOT_SUPPORTED = 50,
ERROR_REM_NOT_LIST = 51,
ERROR_DUP_NAME = 52,
ERROR_BAD_NETPATH = 53,
ERROR_NETWORK_BUSY = 54,
+11 -3
View File
@@ -54,8 +54,10 @@ namespace System.Threading {
IntPtr handle;
IntPtr native_handle; // used only on Win32
/* accessed only from unmanaged code */
private IntPtr name;
private int name_len;
private IntPtr name_chars;
private IntPtr name_generation;
private int name_free;
private int name_length;
private ThreadState state;
private object abort_exc;
private int abort_state_handle;
@@ -403,7 +405,13 @@ namespace System.Threading {
private extern static string GetName_internal (InternalThread thread);
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static void SetName_internal (InternalThread thread, String name);
private static unsafe extern void SetName_icall (InternalThread thread, char *name, int nameLength);
private static unsafe void SetName_internal (InternalThread thread, String name)
{
fixed (char* fixed_name = name)
SetName_icall (thread, fixed_name, name?.Length ?? 0);
}
/*
* The thread name must be shared by appdomains, so it is stored in
+3 -3
View File
@@ -31,6 +31,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System.Globalization;
using System.Collections.Generic;
using System.IO;
using System.Runtime.CompilerServices;
@@ -142,9 +143,8 @@ namespace System
if (appBase == null)
return null;
int len = appBase.Length;
if (len >= 8 && appBase.ToLower ().StartsWith ("file://")) {
appBase = appBase.Substring (7);
if (appBase.StartsWith ("file://", StringComparison.OrdinalIgnoreCase)) {
appBase = new Mono.Security.Uri (appBase).LocalPath;
if (Path.DirectorySeparatorChar != '/')
appBase = appBase.Replace ('/', Path.DirectorySeparatorChar);
}
+2 -5
View File
@@ -1216,13 +1216,10 @@ namespace System
return false;
}
var isUtc = false;
if (dateTime.Kind != DateTimeKind.Utc) {
if (!TryAddTicks (date, -BaseUtcOffset.Ticks, out date, DateTimeKind.Utc))
return false;
} else
isUtc = true;
}
AdjustmentRule current = GetApplicableRule (date);
if (current != null) {
@@ -1234,7 +1231,7 @@ namespace System
if (forOffset)
isDst = true;
offset = baseUtcOffset;
if (isUtc || (date >= new DateTime (tStart.Ticks + current.DaylightDelta.Ticks, DateTimeKind.Utc)))
if (date >= new DateTime (tStart.Ticks + current.DaylightDelta.Ticks, DateTimeKind.Utc))
{
offset += current.DaylightDelta;
isDst = true;
@@ -39,6 +39,7 @@ namespace Mono
MONO_NATIVE_PLATFORM_TYPE_ANDROID = 5,
MONO_NATIVE_PLATFORM_TYPE_FREEBSD = 6,
MONO_NATIVE_PLATFORM_TYPE_HAIKU = 7,
MONO_NATIVE_PLATFORM_TYPE_NETBSD = 8,
MONO_NATIVE_PLATFORM_TYPE_IPHONE = 0x100,
MONO_NATIVE_PLATFORM_TYPE_TV = 0x200,
@@ -899,40 +899,6 @@ namespace MonoTests.System.Reflection.Emit
}
[Test]
public void MethodInfoGetParametersCrash () {
// Regression test for https://github.com/mono/mono/issues/16570
//
// MethodInfo.GetParameters() called on a dynamic assembly would attempt to copy the custom_name and cookie, which could be junk depending
// on how the union is being used.
var aName = new AssemblyName("TestAssembly");
var testAssembly = AppDomain.CurrentDomain.DefineDynamicAssembly(aName, AssemblyBuilderAccess.RunAndSave);
var testModule = testAssembly.DefineDynamicModule(aName.Name, aName.Name + ".dll");
var typeBuilder = testModule.DefineType("TestType");
var ctorBuilder = typeBuilder.DefineConstructor(MethodAttributes.Public, CallingConventions.Standard, Type.EmptyTypes);
var ctorIl = ctorBuilder.GetILGenerator();
ctorIl.Emit(OpCodes.Ret);
var methodBuilder = typeBuilder.DefineMethod("TestMethod", MethodAttributes.Public, typeof(void), new[] { typeof(int[]) });
methodBuilder.DefineParameter(0, ParameterAttributes.Retval, null);
var paramBuilder = methodBuilder.DefineParameter(1, ParameterAttributes.None, null);
var attrCtor = typeof(MarshalAsAttribute).GetConstructor(new[] { typeof(UnmanagedType) });
object[] ctorArgs = { UnmanagedType.LPArray };
var attr = new CustomAttributeBuilder(attrCtor, ctorArgs);
paramBuilder.SetCustomAttribute(attr);
var methodIl = methodBuilder.GetILGenerator();
methodIl.Emit(OpCodes.Ret);
var createdType = typeBuilder.CreateType();
var methodInfo = createdType.GetMethod("TestMethod", BindingFlags.Instance | BindingFlags.Public);
methodInfo.GetParameters();
}
}
}
@@ -29,11 +29,9 @@
using System;
using NUnit.Framework;
using System.Threading;
using NUnit.Framework;
using System.Threading.Tasks;
using System.Collections.Concurrent;
using System.Collections.Generic;
namespace MonoTests.System.Threading
{
@@ -498,102 +496,33 @@ namespace MonoTests.System.Threading
}
}
[Test] // https://github.com/mono/mono/issues/16759
[Category("NotWasm")]
public void EnsureCanceledContinuationsAreOnSameThread ()
[Test] // https://github.com/mono/mono/issues/12421
public void EnsurePostIsNotCalled ()
{
AsyncPump.Run(async delegate {
var _tcs = new TaskCompletionSource<bool>();
var _cts = new CancellationTokenSource();
SynchronizationContext mainContext = SynchronizationContext.Current;
var asc = new AssertSyncContext ();
SynchronizationContext.SetSynchronizationContext (asc);
var ct = new CancellationTokenSource ();
var tcs = new TaskCompletionSource<bool> ();
ct.Token.Register (() => tcs.TrySetCanceled ());
var curThreadId = Thread.CurrentThread.ManagedThreadId;
var taskThreadId = 0;
var taskIsCancelled = false;
var task = Task.Run(() =>
{
taskThreadId = Thread.CurrentThread.ManagedThreadId;
_cts.Cancel();
});
_cts.Token.Register(() => _tcs.TrySetCanceled());
try
{
await _tcs.Task;
}
catch (OperationCanceledException)
{
// Continuation should run on the same thread before the task started.
Assert.AreEqual(curThreadId, Thread.CurrentThread.ManagedThreadId, "#1");
taskIsCancelled = true;
}
Assert.IsTrue (taskIsCancelled, "#2");
Assert.AreNotEqual(taskThreadId, curThreadId, "#3");
});
bool taskIsCancelled = false;
Action awaitAction = async () => {
try { await tcs.Task; }
catch (OperationCanceledException) {
taskIsCancelled = true;
}
};
awaitAction ();
ct.Cancel (); // should not trigger SynchronizationContext.Post
Assert.IsTrue (taskIsCancelled);
SynchronizationContext.SetSynchronizationContext (mainContext);
}
public static class AsyncPump
class AssertSyncContext : SynchronizationContext
{
/// <summary>Runs the specified asynchronous function.</summary>
/// <param name="func">The asynchronous function to execute.</param>
public static void Run(Func<Task> func)
{
if (func == null) throw new ArgumentNullException("func");
var prevCtx = SynchronizationContext.Current;
try
{
// Establish the new context
var syncCtx = new SingleThreadSynchronizationContext();
SynchronizationContext.SetSynchronizationContext(syncCtx);
// Invoke the function and alert the context to when it completes
var t = func();
if (t == null) throw new InvalidOperationException("No task provided.");
t.ContinueWith(delegate { syncCtx.Complete(); }, TaskScheduler.Default);
// Pump continuations and propagate any exceptions
syncCtx.RunOnCurrentThread();
t.GetAwaiter().GetResult();
}
finally { SynchronizationContext.SetSynchronizationContext(prevCtx); }
}
/// <summary>Provides a SynchronizationContext that's single-threaded.</summary>
private sealed class SingleThreadSynchronizationContext : SynchronizationContext
{
/// <summary>The queue of work items.</summary>
private readonly BlockingCollection<KeyValuePair<SendOrPostCallback, object>> m_queue =
new BlockingCollection<KeyValuePair<SendOrPostCallback, object>>();
/// <summary>The processing thread.</summary>
private readonly Thread m_thread = Thread.CurrentThread;
/// <summary>Dispatches an asynchronous message to the synchronization context.</summary>
/// <param name="d">The System.Threading.SendOrPostCallback delegate to call.</param>
/// <param name="state">The object passed to the delegate.</param>
public override void Post(SendOrPostCallback d, object state)
{
if (d == null) throw new ArgumentNullException("d");
m_queue.Add(new KeyValuePair<SendOrPostCallback, object>(d, state));
}
/// <summary>Not supported.</summary>
public override void Send(SendOrPostCallback d, object state)
{
throw new NotSupportedException("Synchronously sending is not supported.");
}
/// <summary>Runs an loop to process all queued work items.</summary>
public void RunOnCurrentThread()
{
foreach (var workItem in m_queue.GetConsumingEnumerable())
workItem.Key(workItem.Value);
}
/// <summary>Notifies the context that no more work will arrive.</summary>
public void Complete() { m_queue.CompleteAdding(); }
}
public override void Post (SendOrPostCallback d, object state) =>
throw new InvalidOperationException ("SynchronizationContext.Post was not expected.");
}
}
}
@@ -198,6 +198,25 @@ namespace MonoTests.System
}
}
[Test]
public void ApplicationBase9 ()
{
AppDomainSetup setup = new AppDomainSetup ();
string url = "file://";
if (RunningOnWindows)
{
url += "/" + Environment.CurrentDirectory;
setup.ApplicationBase = url;
Assert.AreEqual (Environment.CurrentDirectory, setup.ApplicationBase);
}
else
{
url += "/home";
setup.ApplicationBase = url;
Assert.AreEqual ("/home", setup.ApplicationBase);
}
}
#if MONO_FEATURE_MULTIPLE_APPDOMAINS
[Test]
#if MOBILE
@@ -54,11 +54,8 @@ namespace MonoTests.System
return "New Zealand Standard Time";
case "Europe/Athens":
return "GTB Standard Time";
case "Europe/Chisinau":
return "E. Europe Standard Time";
case "US/Eastern":
return "Eastern Standard Time";
case "America/Chicago":
case "US/Central":
return "Central Standard Time";
case "US/Pacific":
@@ -67,57 +64,18 @@ namespace MonoTests.System
case "Australia/Melbourne":
return "AUS Eastern Standard Time";
case "Europe/Brussels":
case "Europe/Copenhagen":
case "Europe/Paris":
case "Europe/Madrid":
return "Romance Standard Time";
case "Africa/Kinshasa":
return "W. Central Africa Standard Time";
case "Europe/Rome":
case "Europe/Vatican":
case "Europe/Vienna":
case "Europe/Berlin":
case "Europe/Luxembourg":
case "Europe/Malta":
case "Europe/Monaco":
case "Europe/Amsterdam":
case "Europe/Oslo":
case "Europe/San_Marino":
return "W. Europe Standard Time";
case "Canada/Eastern":
return "Eastern Standard Time";
case "Asia/Tehran":
return "Iran Standard Time";
case "Europe/Guernsey":
case "Europe/Dublin":
case "Europe/Isle_of_Man":
case "Europe/Jersey":
case "Europe/Lisbon":
case "Europe/London":
return "GMT Standard Time";
case "America/Havana":
return "Cuba Standard Time";
case "America/Anchorage":
return "Alaskan Standard Time";
case "Atlantic/Azores":
return "Azores Standard Time";
case "Asia/Jerusalem":
return "Israel Standard Time";
case "Asia/Amman":
return "Jordan Standard Time";
case "Europe/Tirane":
case "Europe/Warsaw":
return "Central European Standard Time";
case "Europe/Sofia":
case "Europe/Tallinn":
case "Europe/Riga":
case "Europe/Vilnius":
case "Europe/Kiev":
return "FLE Standard Time";
case "Europe/Prague":
case "Europe/Budapest":
case "Europe/Bratislava":
return "Central Europe Standard Time";
default:
Assert.Fail ($"No mapping defined for zone id '{id}'");
return null;
@@ -524,218 +482,6 @@ namespace MonoTests.System
Assert.AreEqual (new TimeSpan (0, 0, 0), tzi.GetUtcOffset (date));
#endif
}
[Test]
public void Bug_16395 ()
{
// Cuba, Havana (Cuba Standard Time): Jumps ahead at 12:00 AM on 3/8/2020 to 1:00 AM
CheckJumpingIntoDST ("America/Havana",
new DateTime (2020, 3, 8, 0, 0, 0), new DateTime (2020, 3, 8, 0, 30, 0), new DateTime (2020, 3, 8, 1, 0, 0),
new TimeSpan (-5, 0, 0), new TimeSpan (-4, 0, 0));
// US, Kansas City, MO (US Central Time): Jumps ahead at 2:00 AM on 3/8/2020 to 3:00 AM
CheckJumpingIntoDST ("America/Chicago",
new DateTime (2020, 3, 8, 2, 0, 0), new DateTime (2020, 3, 8, 2, 30, 0), new DateTime (2020, 3, 8, 3, 0, 0),
new TimeSpan (-6, 0, 0), new TimeSpan (-5, 0, 0));
// Anchorage, AK (Alaska Time): Jumps ahead at 2:00 AM on 3/8/2020 to 3:00 AM
CheckJumpingIntoDST ("America/Anchorage",
new DateTime (2020, 3, 8, 2, 0, 0), new DateTime (2020, 3, 8, 2, 30, 0), new DateTime (2020, 3, 8, 3, 0, 0),
new TimeSpan (-9, 0, 0), new TimeSpan (-8, 0, 0));
// Azores ST (Ponta Delgada, Portugal): Jumps ahead at 12:00 AM on 3/29/2020 to 1:00 AM
CheckJumpingIntoDST ("Atlantic/Azores",
new DateTime (2020, 3, 29, 0, 0, 0), new DateTime (2020, 3, 29, 0, 30, 0), new DateTime (2020, 3, 29, 1, 0, 0),
new TimeSpan (-1, 0, 0), new TimeSpan (0, 0, 0));
// Iran, Tehran (Iran ST): Jumps ahead at 12:00 AM on 3/21/2020 to 1:00 AM
CheckJumpingIntoDST ("Asia/Tehran",
new DateTime (2020, 3, 21, 0, 0, 0), new DateTime (2020, 3, 21, 0, 30, 0), new DateTime (2020, 3, 21, 1, 0, 0),
new TimeSpan (3, 30, 0), new TimeSpan (4, 30, 0));
// Israel, Jerusalem (Israel ST): Jumps ahead at 2:00 AM on 3/27/2020 to 3:00 AM
CheckJumpingIntoDST ("Asia/Jerusalem",
new DateTime (2020, 3, 27, 2, 0, 0), new DateTime (2020, 3, 27, 2, 30, 0), new DateTime (2020, 3, 27, 3, 0, 0),
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
// Jordan, Amman (Eastern European ST): Jumps ahead at 12:00 AM on 3/27/2020 to 1:00 AM
CheckJumpingIntoDST ("Asia/Amman",
new DateTime (2020, 3, 27, 0, 0, 0), new DateTime (2020, 3, 27, 0, 30, 0), new DateTime (2020, 3, 27, 1, 0, 0),
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
// Albania, Tirana (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Tirane",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Austria, Vienna (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Vienna",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Belgium, Brussels (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Brussels",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Bulgaria, Sofia (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
CheckJumpingIntoDST ("Europe/Sofia",
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
// Czechia, Prague (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Prague",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Denmark, Copenhagen (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Copenhagen",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Estonia, Tallinn (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
CheckJumpingIntoDST ("Europe/Tallinn",
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
// France, Paris (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Paris",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Germany, Berlin (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Berlin",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Greece, Athens (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
CheckJumpingIntoDST ("Europe/Athens",
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
// Guernsey (UK) Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
CheckJumpingIntoDST ("Europe/Guernsey",
new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
// Holy See, Vatican City (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Vatican",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Hungary, Budapest (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Budapest",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// // Ireland, Dublin (Greenwich Mean Time -> Irish Standard Time): Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
// CheckJumpingIntoDST ("Europe/Dublin",
// new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
// new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
// UK, Douglas, Isle of Man (GMT+1:00): Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
CheckJumpingIntoDST ("Europe/Isle_of_Man",
new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
// Italy, Rome (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Rome",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Jersey (UK): Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
CheckJumpingIntoDST ("Europe/Jersey",
new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
// Latvia, Riga (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
CheckJumpingIntoDST ("Europe/Riga",
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
// Lithuania, Vilnius (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
CheckJumpingIntoDST ("Europe/Vilnius",
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
// Luxembourg, Luxembourg (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Luxembourg",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Malta, Valletta (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Malta",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Moldova, Chişinău (Eastern European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Chisinau",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
// Monaco, Monaco (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Monaco",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Netherlands, Amsterdam (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Amsterdam",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Norway, Oslo (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Oslo",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Poland, Warsaw (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Warsaw",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Portugal, Lisbon (Western European ST): Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
CheckJumpingIntoDST ("Europe/Lisbon",
new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
// San Marino, San Marino (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/San_Marino",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Slovakia, Bratislava (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Bratislava",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Spain, Madrid (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
CheckJumpingIntoDST ("Europe/Madrid",
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
// Ukraine, Kiev (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
CheckJumpingIntoDST ("Europe/Kiev",
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
// United Kingdom, London (British ST): Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
CheckJumpingIntoDST ("Europe/London",
new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
}
void CheckJumpingIntoDST (string tzId, DateTime dstDeltaStart, DateTime inDstDelta, DateTime dstDeltaEnd, TimeSpan baseOffset, TimeSpan dstOffset)
{
var tzi = TimeZoneInfo.FindSystemTimeZoneById (MapTimeZoneId (tzId));
Assert.IsFalse (tzi.IsDaylightSavingTime (dstDeltaStart), $"{tzId}: #1");
Assert.AreEqual (baseOffset, tzi.GetUtcOffset (dstDeltaStart), $"{tzId}: #2");
Assert.IsFalse (tzi.IsDaylightSavingTime (inDstDelta), $"{tzId}: #3");
Assert.AreEqual (baseOffset, tzi.GetUtcOffset (inDstDelta), $"{tzId}: #4");
Assert.IsTrue (tzi.IsDaylightSavingTime (dstDeltaEnd), $"{tzId}: #5");
Assert.AreEqual (dstOffset, tzi.GetUtcOffset (dstDeltaEnd), $"{tzId}: #6");
}
}
[TestFixture]
@@ -1,185 +0,0 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Diagnostics;
namespace System.Buffers
{
/// <summary>
/// Represents a heap-based, array-backed output sink into which <typeparam name="T"/> data can be written.
/// </summary>
public sealed class ArrayBufferWriter<T> : IBufferWriter<T>
{
private T[] _buffer;
private int _index;
private const int DefaultInitialBufferSize = 256;
/// <summary>
/// Creates an instance of an <see cref="ArrayBufferWriter{T}"/>, in which data can be written to,
/// with the default initial capacity.
/// </summary>
public ArrayBufferWriter()
{
_buffer = Array.Empty<T>();
_index = 0;
}
/// <summary>
/// Creates an instance of an <see cref="ArrayBufferWriter{T}"/>, in which data can be written to,
/// with an initial capacity specified.
/// </summary>
/// <param name="initialCapacity">The minimum capacity with which to initialize the underlying buffer.</param>
/// <exception cref="ArgumentException">
/// Thrown when <paramref name="initialCapacity"/> is not positive (i.e. less than or equal to 0).
/// </exception>
public ArrayBufferWriter(int initialCapacity)
{
if (initialCapacity <= 0)
throw new ArgumentException(nameof(initialCapacity));
_buffer = new T[initialCapacity];
_index = 0;
}
/// <summary>
/// Returns the data written to the underlying buffer so far, as a <see cref="ReadOnlyMemory{T}"/>.
/// </summary>
public ReadOnlyMemory<T> WrittenMemory => _buffer.AsMemory(0, _index);
/// <summary>
/// Returns the data written to the underlying buffer so far, as a <see cref="ReadOnlySpan{T}"/>.
/// </summary>
public ReadOnlySpan<T> WrittenSpan => _buffer.AsSpan(0, _index);
/// <summary>
/// Returns the amount of data written to the underlying buffer so far.
/// </summary>
public int WrittenCount => _index;
/// <summary>
/// Returns the total amount of space within the underlying buffer.
/// </summary>
public int Capacity => _buffer.Length;
/// <summary>
/// Returns the amount of space available that can still be written into without forcing the underlying buffer to grow.
/// </summary>
public int FreeCapacity => _buffer.Length - _index;
/// <summary>
/// Clears the data written to the underlying buffer.
/// </summary>
/// <remarks>
/// You must clear the <see cref="ArrayBufferWriter{T}"/> before trying to re-use it.
/// </remarks>
public void Clear()
{
Debug.Assert(_buffer.Length >= _index);
_buffer.AsSpan(0, _index).Clear();
_index = 0;
}
/// <summary>
/// Notifies <see cref="IBufferWriter{T}"/> that <paramref name="count"/> amount of data was written to the output <see cref="Span{T}"/>/<see cref="Memory{T}"/>
/// </summary>
/// <exception cref="ArgumentException">
/// Thrown when <paramref name="count"/> is negative.
/// </exception>
/// <exception cref="InvalidOperationException">
/// Thrown when attempting to advance past the end of the underlying buffer.
/// </exception>
/// <remarks>
/// You must request a new buffer after calling Advance to continue writing more data and cannot write to a previously acquired buffer.
/// </remarks>
public void Advance(int count)
{
if (count < 0)
throw new ArgumentException(nameof(count));
if (_index > _buffer.Length - count)
ThrowInvalidOperationException_AdvancedTooFar(_buffer.Length);
_index += count;
}
/// <summary>
/// Returns a <see cref="Memory{T}"/> to write to that is at least the requested length (specified by <paramref name="sizeHint"/>).
/// If no <paramref name="sizeHint"/> is provided (or it's equal to <code>0</code>), some non-empty buffer is returned.
/// </summary>
/// <exception cref="ArgumentException">
/// Thrown when <paramref name="sizeHint"/> is negative.
/// </exception>
/// <remarks>
/// This will never return an empty <see cref="Memory{T}"/>.
/// </remarks>
/// <remarks>
/// There is no guarantee that successive calls will return the same buffer or the same-sized buffer.
/// </remarks>
/// <remarks>
/// You must request a new buffer after calling Advance to continue writing more data and cannot write to a previously acquired buffer.
/// </remarks>
public Memory<T> GetMemory(int sizeHint = 0)
{
CheckAndResizeBuffer(sizeHint);
Debug.Assert(_buffer.Length > _index);
return _buffer.AsMemory(_index);
}
/// <summary>
/// Returns a <see cref="Span{T}"/> to write to that is at least the requested length (specified by <paramref name="sizeHint"/>).
/// If no <paramref name="sizeHint"/> is provided (or it's equal to <code>0</code>), some non-empty buffer is returned.
/// </summary>
/// <exception cref="ArgumentException">
/// Thrown when <paramref name="sizeHint"/> is negative.
/// </exception>
/// <remarks>
/// This will never return an empty <see cref="Span{T}"/>.
/// </remarks>
/// <remarks>
/// There is no guarantee that successive calls will return the same buffer or the same-sized buffer.
/// </remarks>
/// <remarks>
/// You must request a new buffer after calling Advance to continue writing more data and cannot write to a previously acquired buffer.
/// </remarks>
public Span<T> GetSpan(int sizeHint = 0)
{
CheckAndResizeBuffer(sizeHint);
Debug.Assert(_buffer.Length > _index);
return _buffer.AsSpan(_index);
}
private void CheckAndResizeBuffer(int sizeHint)
{
if (sizeHint < 0)
throw new ArgumentException(nameof(sizeHint));
if (sizeHint == 0)
{
sizeHint = 1;
}
if (sizeHint > FreeCapacity)
{
int growBy = Math.Max(sizeHint, _buffer.Length);
if (_buffer.Length == 0)
{
growBy = Math.Max(growBy, DefaultInitialBufferSize);
}
int newSize = checked(_buffer.Length + growBy);
Array.Resize(ref _buffer, newSize);
}
Debug.Assert(FreeCapacity > 0 && FreeCapacity >= sizeHint);
}
private static void ThrowInvalidOperationException_AdvancedTooFar(int capacity)
{
throw new InvalidOperationException(SR.Format(SR.BufferWriterAdvancedTooFar, capacity));
}
}
}
@@ -1,128 +0,0 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace System.Diagnostics.CodeAnalysis
{
/// <summary>Specifies that null is allowed as an input even if the corresponding type disallows it.</summary>
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
#if INTERNAL_NULLABLE_ATTRIBUTES
internal
#else
public
#endif
sealed class AllowNullAttribute : Attribute { }
/// <summary>Specifies that null is disallowed as an input even if the corresponding type allows it.</summary>
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
#if INTERNAL_NULLABLE_ATTRIBUTES
internal
#else
public
#endif
sealed class DisallowNullAttribute : Attribute { }
/// <summary>Specifies that an output may be null even if the corresponding type disallows it.</summary>
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
#if INTERNAL_NULLABLE_ATTRIBUTES
internal
#else
public
#endif
sealed class MaybeNullAttribute : Attribute { }
/// <summary>Specifies that an output will not be null even if the corresponding type allows it.</summary>
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
#if INTERNAL_NULLABLE_ATTRIBUTES
internal
#else
public
#endif
sealed class NotNullAttribute : Attribute { }
/// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter may be null even if the corresponding type disallows it.</summary>
[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
#if INTERNAL_NULLABLE_ATTRIBUTES
internal
#else
public
#endif
sealed class MaybeNullWhenAttribute : Attribute
{
/// <summary>Initializes the attribute with the specified return value condition.</summary>
/// <param name="returnValue">
/// The return value condition. If the method returns this value, the associated parameter may be null.
/// </param>
public MaybeNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
/// <summary>Gets the return value condition.</summary>
public bool ReturnValue { get; }
}
/// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.</summary>
[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
#if INTERNAL_NULLABLE_ATTRIBUTES
internal
#else
public
#endif
sealed class NotNullWhenAttribute : Attribute
{
/// <summary>Initializes the attribute with the specified return value condition.</summary>
/// <param name="returnValue">
/// The return value condition. If the method returns this value, the associated parameter will not be null.
/// </param>
public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
/// <summary>Gets the return value condition.</summary>
public bool ReturnValue { get; }
}
/// <summary>Specifies that the output will be non-null if the named parameter is non-null.</summary>
[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
#if INTERNAL_NULLABLE_ATTRIBUTES
internal
#else
public
#endif
sealed class NotNullIfNotNullAttribute : Attribute
{
/// <summary>Initializes the attribute with the associated parameter name.</summary>
/// <param name="parameterName">
/// The associated parameter name. The output will be non-null if the argument to the parameter specified is non-null.
/// </param>
public NotNullIfNotNullAttribute(string parameterName) => ParameterName = parameterName;
/// <summary>Gets the associated parameter name.</summary>
public string ParameterName { get; }
}
/// <summary>Applied to a method that will never return under any circumstance.</summary>
[AttributeUsage(AttributeTargets.Method, Inherited = false)]
#if INTERNAL_NULLABLE_ATTRIBUTES
internal
#else
public
#endif
sealed class DoesNotReturnAttribute : Attribute { }
/// <summary>Specifies that the method will not return if the associated Boolean parameter is passed the specified value.</summary>
[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
#if INTERNAL_NULLABLE_ATTRIBUTES
internal
#else
public
#endif
sealed class DoesNotReturnIfAttribute : Attribute
{
/// <summary>Initializes the attribute with the specified parameter value.</summary>
/// <param name="parameterValue">
/// The condition parameter value. Code after the method will be considered unreachable by diagnostics if the argument to
/// the associated parameter matches this value.
/// </param>
public DoesNotReturnIfAttribute(bool parameterValue) => ParameterValue = parameterValue;
/// <summary>Gets the condition parameter value.</summary>
public bool ParameterValue { get; }
}
}
-3
View File
@@ -26,7 +26,4 @@ partial class SR
public const string Arg_SwitchExpressionException = "Non-exhaustive switch expression failed to match its input.";
public const string SwitchExpressionException_UnmatchedValue = "Unmatched value was {0}.";
public const string Argument_InvalidRandomRange = "Range of random number does not contain at least one possibility.";
public const string BufferWriterAdvancedTooFar = "Cannot advance past the end of the buffer, which has a size of {0}.";
public const string net_gssapi_operation_failed_detailed_majoronly = "GSSAPI operation failed with error - {0}.";
public const string net_gssapi_operation_failed_majoronly = "SSAPI operation failed with status: {0}.";
}
@@ -1,778 +0,0 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Diagnostics;
using System.Runtime.CompilerServices;
namespace System.Buffers
{
#if __MonoCS__
public ref partial struct SequenceReader<T> where T : IEquatable<T>
#else
public ref partial struct SequenceReader<T> where T : unmanaged, IEquatable<T>
#endif
{
/// <summary>
/// Try to read everything up to the given <paramref name="delimiter"/>.
/// </summary>
/// <param name="span">The read data, if any.</param>
/// <param name="delimiter">The delimiter to look for.</param>
/// <param name="advancePastDelimiter">True to move past the <paramref name="delimiter"/> if found.</param>
/// <returns>True if the <paramref name="delimiter"/> was found.</returns>
public bool TryReadTo(out ReadOnlySpan<T> span, T delimiter, bool advancePastDelimiter = true)
{
ReadOnlySpan<T> remaining = UnreadSpan;
int index = remaining.IndexOf(delimiter);
if (index != -1)
{
span = index == 0 ? default : remaining.Slice(0, index);
AdvanceCurrentSpan(index + (advancePastDelimiter ? 1 : 0));
return true;
}
return TryReadToSlow(out span, delimiter, advancePastDelimiter);
}
private bool TryReadToSlow(out ReadOnlySpan<T> span, T delimiter, bool advancePastDelimiter)
{
if (!TryReadToInternal(out ReadOnlySequence<T> sequence, delimiter, advancePastDelimiter, CurrentSpan.Length - CurrentSpanIndex))
{
span = default;
return false;
}
span = sequence.IsSingleSegment ? sequence.First.Span : sequence.ToArray();
return true;
}
/// <summary>
/// Try to read everything up to the given <paramref name="delimiter"/>, ignoring delimiters that are
/// preceded by <paramref name="delimiterEscape"/>.
/// </summary>
/// <param name="span">The read data, if any.</param>
/// <param name="delimiter">The delimiter to look for.</param>
/// <param name="delimiterEscape">If found prior to <paramref name="delimiter"/> it will skip that occurrence.</param>
/// <param name="advancePastDelimiter">True to move past the <paramref name="delimiter"/> if found.</param>
/// <returns>True if the <paramref name="delimiter"/> was found.</returns>
public bool TryReadTo(out ReadOnlySpan<T> span, T delimiter, T delimiterEscape, bool advancePastDelimiter = true)
{
ReadOnlySpan<T> remaining = UnreadSpan;
int index = remaining.IndexOf(delimiter);
if ((index > 0 && !remaining[index - 1].Equals(delimiterEscape)) || index == 0)
{
span = remaining.Slice(0, index);
AdvanceCurrentSpan(index + (advancePastDelimiter ? 1 : 0));
return true;
}
// This delimiter might be skipped, go down the slow path
return TryReadToSlow(out span, delimiter, delimiterEscape, index, advancePastDelimiter);
}
private bool TryReadToSlow(out ReadOnlySpan<T> span, T delimiter, T delimiterEscape, int index, bool advancePastDelimiter)
{
if (!TryReadToSlow(out ReadOnlySequence<T> sequence, delimiter, delimiterEscape, index, advancePastDelimiter))
{
span = default;
return false;
}
Debug.Assert(sequence.Length > 0);
span = sequence.IsSingleSegment ? sequence.First.Span : sequence.ToArray();
return true;
}
private bool TryReadToSlow(out ReadOnlySequence<T> sequence, T delimiter, T delimiterEscape, int index, bool advancePastDelimiter)
{
SequenceReader<T> copy = this;
ReadOnlySpan<T> remaining = UnreadSpan;
bool priorEscape = false;
do
{
if (index >= 0)
{
if (index == 0 && priorEscape)
{
// We were in the escaped state, so skip this delimiter
priorEscape = false;
Advance(index + 1);
remaining = UnreadSpan;
goto Continue;
}
else if (index > 0 && remaining[index - 1].Equals(delimiterEscape))
{
// This delimiter might be skipped
// Count our escapes
int escapeCount = 1;
int i = index - 2;
for (; i >= 0; i--)
{
if (!remaining[i].Equals(delimiterEscape))
break;
}
if (i < 0 && priorEscape)
{
// Started and ended with escape, increment once more
escapeCount++;
}
escapeCount += index - 2 - i;
if ((escapeCount & 1) != 0)
{
// An odd escape count means we're currently escaped,
// skip the delimiter and reset escaped state.
Advance(index + 1);
priorEscape = false;
remaining = UnreadSpan;
goto Continue;
}
}
// Found the delimiter. Move to it, slice, then move past it.
AdvanceCurrentSpan(index);
sequence = Sequence.Slice(copy.Position, Position);
if (advancePastDelimiter)
{
Advance(1);
}
return true;
}
else
{
// No delimiter, need to check the end of the span for odd number of escapes then advance
if (remaining.Length > 0 && remaining[remaining.Length - 1].Equals(delimiterEscape))
{
int escapeCount = 1;
int i = remaining.Length - 2;
for (; i >= 0; i--)
{
if (!remaining[i].Equals(delimiterEscape))
break;
}
escapeCount += remaining.Length - 2 - i;
if (i < 0 && priorEscape)
priorEscape = (escapeCount & 1) == 0; // equivalent to incrementing escapeCount before setting priorEscape
else
priorEscape = (escapeCount & 1) != 0;
}
else
{
priorEscape = false;
}
}
// Nothing in the current span, move to the end, checking for the skip delimiter
AdvanceCurrentSpan(remaining.Length);
remaining = CurrentSpan;
Continue:
index = remaining.IndexOf(delimiter);
} while (!End);
// Didn't find anything, reset our original state.
this = copy;
sequence = default;
return false;
}
/// <summary>
/// Try to read everything up to the given <paramref name="delimiter"/>.
/// </summary>
/// <param name="sequence">The read data, if any.</param>
/// <param name="delimiter">The delimiter to look for.</param>
/// <param name="advancePastDelimiter">True to move past the <paramref name="delimiter"/> if found.</param>
/// <returns>True if the <paramref name="delimiter"/> was found.</returns>
public bool TryReadTo(out ReadOnlySequence<T> sequence, T delimiter, bool advancePastDelimiter = true)
{
return TryReadToInternal(out sequence, delimiter, advancePastDelimiter);
}
private bool TryReadToInternal(out ReadOnlySequence<T> sequence, T delimiter, bool advancePastDelimiter, int skip = 0)
{
Debug.Assert(skip >= 0);
SequenceReader<T> copy = this;
if (skip > 0)
Advance(skip);
ReadOnlySpan<T> remaining = UnreadSpan;
while (_moreData)
{
int index = remaining.IndexOf(delimiter);
if (index != -1)
{
// Found the delimiter. Move to it, slice, then move past it.
if (index > 0)
{
AdvanceCurrentSpan(index);
}
sequence = Sequence.Slice(copy.Position, Position);
if (advancePastDelimiter)
{
Advance(1);
}
return true;
}
AdvanceCurrentSpan(remaining.Length);
remaining = CurrentSpan;
}
// Didn't find anything, reset our original state.
this = copy;
sequence = default;
return false;
}
/// <summary>
/// Try to read everything up to the given <paramref name="delimiter"/>, ignoring delimiters that are
/// preceded by <paramref name="delimiterEscape"/>.
/// </summary>
/// <param name="sequence">The read data, if any.</param>
/// <param name="delimiter">The delimiter to look for.</param>
/// <param name="delimiterEscape">If found prior to <paramref name="delimiter"/> it will skip that occurrence.</param>
/// <param name="advancePastDelimiter">True to move past the <paramref name="delimiter"/> if found.</param>
/// <returns>True if the <paramref name="delimiter"/> was found.</returns>
public bool TryReadTo(out ReadOnlySequence<T> sequence, T delimiter, T delimiterEscape, bool advancePastDelimiter = true)
{
SequenceReader<T> copy = this;
ReadOnlySpan<T> remaining = UnreadSpan;
bool priorEscape = false;
while (_moreData)
{
int index = remaining.IndexOf(delimiter);
if (index != -1)
{
if (index == 0 && priorEscape)
{
// We were in the escaped state, so skip this delimiter
priorEscape = false;
Advance(index + 1);
remaining = UnreadSpan;
continue;
}
else if (index > 0 && remaining[index - 1].Equals(delimiterEscape))
{
// This delimiter might be skipped
// Count our escapes
int escapeCount = 0;
for (int i = index; i > 0 && remaining[i - 1].Equals(delimiterEscape); i--, escapeCount++)
;
if (escapeCount == index && priorEscape)
{
// Started and ended with escape, increment once more
escapeCount++;
}
priorEscape = false;
if ((escapeCount & 1) != 0)
{
// Odd escape count means we're in the escaped state, so skip this delimiter
Advance(index + 1);
remaining = UnreadSpan;
continue;
}
}
// Found the delimiter. Move to it, slice, then move past it.
if (index > 0)
{
Advance(index);
}
sequence = Sequence.Slice(copy.Position, Position);
if (advancePastDelimiter)
{
Advance(1);
}
return true;
}
// No delimiter, need to check the end of the span for odd number of escapes then advance
{
int escapeCount = 0;
for (int i = remaining.Length; i > 0 && remaining[i - 1].Equals(delimiterEscape); i--, escapeCount++)
;
if (priorEscape && escapeCount == remaining.Length)
{
escapeCount++;
}
priorEscape = escapeCount % 2 != 0;
}
// Nothing in the current span, move to the end, checking for the skip delimiter
Advance(remaining.Length);
remaining = CurrentSpan;
}
// Didn't find anything, reset our original state.
this = copy;
sequence = default;
return false;
}
/// <summary>
/// Try to read everything up to the given <paramref name="delimiters"/>.
/// </summary>
/// <param name="span">The read data, if any.</param>
/// <param name="delimiters">The delimiters to look for.</param>
/// <param name="advancePastDelimiter">True to move past the first found instance of any of the given <paramref name="delimiters"/>.</param>
/// <returns>True if any of the <paramref name="delimiters"/> were found.</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool TryReadToAny(out ReadOnlySpan<T> span, ReadOnlySpan<T> delimiters, bool advancePastDelimiter = true)
{
ReadOnlySpan<T> remaining = UnreadSpan;
int index = delimiters.Length == 2
? remaining.IndexOfAny(delimiters[0], delimiters[1])
: remaining.IndexOfAny(delimiters);
if (index != -1)
{
span = remaining.Slice(0, index);
Advance(index + (advancePastDelimiter ? 1 : 0));
return true;
}
return TryReadToAnySlow(out span, delimiters, advancePastDelimiter);
}
private bool TryReadToAnySlow(out ReadOnlySpan<T> span, ReadOnlySpan<T> delimiters, bool advancePastDelimiter)
{
if (!TryReadToAnyInternal(out ReadOnlySequence<T> sequence, delimiters, advancePastDelimiter, CurrentSpan.Length - CurrentSpanIndex))
{
span = default;
return false;
}
span = sequence.IsSingleSegment ? sequence.First.Span : sequence.ToArray();
return true;
}
/// <summary>
/// Try to read everything up to the given <paramref name="delimiters"/>.
/// </summary>
/// <param name="sequence">The read data, if any.</param>
/// <param name="delimiters">The delimiters to look for.</param>
/// <param name="advancePastDelimiter">True to move past the first found instance of any of the given <paramref name="delimiters"/>.</param>
/// <returns>True if any of the <paramref name="delimiters"/> were found.</returns>
public bool TryReadToAny(out ReadOnlySequence<T> sequence, ReadOnlySpan<T> delimiters, bool advancePastDelimiter = true)
{
return TryReadToAnyInternal(out sequence, delimiters, advancePastDelimiter);
}
private bool TryReadToAnyInternal(out ReadOnlySequence<T> sequence, ReadOnlySpan<T> delimiters, bool advancePastDelimiter, int skip = 0)
{
SequenceReader<T> copy = this;
if (skip > 0)
Advance(skip);
ReadOnlySpan<T> remaining = UnreadSpan;
while (!End)
{
int index = delimiters.Length == 2
? remaining.IndexOfAny(delimiters[0], delimiters[1])
: remaining.IndexOfAny(delimiters);
if (index != -1)
{
// Found one of the delimiters. Move to it, slice, then move past it.
if (index > 0)
{
AdvanceCurrentSpan(index);
}
sequence = Sequence.Slice(copy.Position, Position);
if (advancePastDelimiter)
{
Advance(1);
}
return true;
}
Advance(remaining.Length);
remaining = CurrentSpan;
}
// Didn't find anything, reset our original state.
this = copy;
sequence = default;
return false;
}
/// <summary>
/// Try to read data until the entire given <paramref name="delimiter"/> matches.
/// </summary>
/// <param name="sequence">The read data, if any.</param>
/// <param name="delimiter">The multi (T) delimiter.</param>
/// <param name="advancePastDelimiter">True to move past the <paramref name="delimiter"/> if found.</param>
/// <returns>True if the <paramref name="delimiter"/> was found.</returns>
public bool TryReadTo(out ReadOnlySequence<T> sequence, ReadOnlySpan<T> delimiter, bool advancePastDelimiter = true)
{
if (delimiter.Length == 0)
{
sequence = default;
return true;
}
SequenceReader<T> copy = this;
bool advanced = false;
while (!End)
{
if (!TryReadTo(out sequence, delimiter[0], advancePastDelimiter: false))
{
this = copy;
return false;
}
if (delimiter.Length == 1)
{
if (advancePastDelimiter)
{
Advance(1);
}
return true;
}
if (IsNext(delimiter))
{
// Probably a faster way to do this, potentially by avoiding the Advance in the previous TryReadTo call
if (advanced)
{
sequence = copy.Sequence.Slice(copy.Consumed, Consumed - copy.Consumed);
}
if (advancePastDelimiter)
{
Advance(delimiter.Length);
}
return true;
}
else
{
Advance(1);
advanced = true;
}
}
this = copy;
sequence = default;
return false;
}
/// <summary>
/// Advance until the given <paramref name="delimiter"/>, if found.
/// </summary>
/// <param name="delimiter">The delimiter to search for.</param>
/// <param name="advancePastDelimiter">True to move past the <paramref name="delimiter"/> if found.</param>
/// <returns>True if the given <paramref name="delimiter"/> was found.</returns>
public bool TryAdvanceTo(T delimiter, bool advancePastDelimiter = true)
{
ReadOnlySpan<T> remaining = UnreadSpan;
int index = remaining.IndexOf(delimiter);
if (index != -1)
{
Advance(advancePastDelimiter ? index + 1 : index);
return true;
}
return TryReadToInternal(out _, delimiter, advancePastDelimiter);
}
/// <summary>
/// Advance until any of the given <paramref name="delimiters"/>, if found.
/// </summary>
/// <param name="delimiters">The delimiters to search for.</param>
/// <param name="advancePastDelimiter">True to move past the first found instance of any of the given <paramref name="delimiters"/>.</param>
/// <returns>True if any of the given <paramref name="delimiters"/> were found.</returns>
public bool TryAdvanceToAny(ReadOnlySpan<T> delimiters, bool advancePastDelimiter = true)
{
ReadOnlySpan<T> remaining = UnreadSpan;
int index = remaining.IndexOfAny(delimiters);
if (index != -1)
{
AdvanceCurrentSpan(index + (advancePastDelimiter ? 1 : 0));
return true;
}
return TryReadToAnyInternal(out _, delimiters, advancePastDelimiter);
}
/// <summary>
/// Advance past consecutive instances of the given <paramref name="value"/>.
/// </summary>
/// <returns>How many positions the reader has been advanced.</returns>
public long AdvancePast(T value)
{
long start = Consumed;
do
{
// Advance past all matches in the current span
int i;
for (i = CurrentSpanIndex; i < CurrentSpan.Length && CurrentSpan[i].Equals(value); i++)
{
}
int advanced = i - CurrentSpanIndex;
if (advanced == 0)
{
// Didn't advance at all in this span, exit.
break;
}
AdvanceCurrentSpan(advanced);
// If we're at postion 0 after advancing and not at the End,
// we're in a new span and should continue the loop.
} while (CurrentSpanIndex == 0 && !End);
return Consumed - start;
}
/// <summary>
/// Skip consecutive instances of any of the given <paramref name="values"/>.
/// </summary>
/// <returns>How many positions the reader has been advanced.</returns>
public long AdvancePastAny(ReadOnlySpan<T> values)
{
long start = Consumed;
do
{
// Advance past all matches in the current span
int i;
for (i = CurrentSpanIndex; i < CurrentSpan.Length && values.IndexOf(CurrentSpan[i]) != -1; i++)
{
}
int advanced = i - CurrentSpanIndex;
if (advanced == 0)
{
// Didn't advance at all in this span, exit.
break;
}
AdvanceCurrentSpan(advanced);
// If we're at postion 0 after advancing and not at the End,
// we're in a new span and should continue the loop.
} while (CurrentSpanIndex == 0 && !End);
return Consumed - start;
}
/// <summary>
/// Advance past consecutive instances of any of the given values.
/// </summary>
/// <returns>How many positions the reader has been advanced.</returns>
public long AdvancePastAny(T value0, T value1, T value2, T value3)
{
long start = Consumed;
do
{
// Advance past all matches in the current span
int i;
for (i = CurrentSpanIndex; i < CurrentSpan.Length; i++)
{
T value = CurrentSpan[i];
if (!value.Equals(value0) && !value.Equals(value1) && !value.Equals(value2) && !value.Equals(value3))
{
break;
}
}
int advanced = i - CurrentSpanIndex;
if (advanced == 0)
{
// Didn't advance at all in this span, exit.
break;
}
AdvanceCurrentSpan(advanced);
// If we're at postion 0 after advancing and not at the End,
// we're in a new span and should continue the loop.
} while (CurrentSpanIndex == 0 && !End);
return Consumed - start;
}
/// <summary>
/// Advance past consecutive instances of any of the given values.
/// </summary>
/// <returns>How many positions the reader has been advanced.</returns>
public long AdvancePastAny(T value0, T value1, T value2)
{
long start = Consumed;
do
{
// Advance past all matches in the current span
int i;
for (i = CurrentSpanIndex; i < CurrentSpan.Length; i++)
{
T value = CurrentSpan[i];
if (!value.Equals(value0) && !value.Equals(value1) && !value.Equals(value2))
{
break;
}
}
int advanced = i - CurrentSpanIndex;
if (advanced == 0)
{
// Didn't advance at all in this span, exit.
break;
}
AdvanceCurrentSpan(advanced);
// If we're at postion 0 after advancing and not at the End,
// we're in a new span and should continue the loop.
} while (CurrentSpanIndex == 0 && !End);
return Consumed - start;
}
/// <summary>
/// Advance past consecutive instances of any of the given values.
/// </summary>
/// <returns>How many positions the reader has been advanced.</returns>
public long AdvancePastAny(T value0, T value1)
{
long start = Consumed;
do
{
// Advance past all matches in the current span
int i;
for (i = CurrentSpanIndex; i < CurrentSpan.Length; i++)
{
T value = CurrentSpan[i];
if (!value.Equals(value0) && !value.Equals(value1))
{
break;
}
}
int advanced = i - CurrentSpanIndex;
if (advanced == 0)
{
// Didn't advance at all in this span, exit.
break;
}
AdvanceCurrentSpan(advanced);
// If we're at postion 0 after advancing and not at the End,
// we're in a new span and should continue the loop.
} while (CurrentSpanIndex == 0 && !End);
return Consumed - start;
}
/// <summary>
/// Check to see if the given <paramref name="next"/> value is next.
/// </summary>
/// <param name="next">The value to compare the next items to.</param>
/// <param name="advancePast">Move past the <paramref name="next"/> value if found.</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool IsNext(T next, bool advancePast = false)
{
if (End)
return false;
if (CurrentSpan[CurrentSpanIndex].Equals(next))
{
if (advancePast)
{
AdvanceCurrentSpan(1);
}
return true;
}
return false;
}
/// <summary>
/// Check to see if the given <paramref name="next"/> values are next.
/// </summary>
/// <param name="next">The span to compare the next items to.</param>
/// <param name="advancePast">Move past the <paramref name="next"/> values if found.</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool IsNext(ReadOnlySpan<T> next, bool advancePast = false)
{
ReadOnlySpan<T> unread = UnreadSpan;
if (unread.StartsWith(next))
{
if (advancePast)
{
AdvanceCurrentSpan(next.Length);
}
return true;
}
// Only check the slow path if there wasn't enough to satisfy next
return unread.Length < next.Length && IsNextSlow(next, advancePast);
}
private unsafe bool IsNextSlow(ReadOnlySpan<T> next, bool advancePast)
{
ReadOnlySpan<T> currentSpan = UnreadSpan;
// We should only come in here if we need more data than we have in our current span
Debug.Assert(currentSpan.Length < next.Length);
int fullLength = next.Length;
SequencePosition nextPosition = _nextPosition;
while (next.StartsWith(currentSpan))
{
if (next.Length == currentSpan.Length)
{
// Fully matched
if (advancePast)
{
Advance(fullLength);
}
return true;
}
// Need to check the next segment
while (true)
{
if (!Sequence.TryGet(ref nextPosition, out ReadOnlyMemory<T> nextSegment, advance: true))
{
// Nothing left
return false;
}
if (nextSegment.Length > 0)
{
next = next.Slice(currentSpan.Length);
currentSpan = nextSegment.Span;
if (currentSpan.Length > next.Length)
{
currentSpan = currentSpan.Slice(0, next.Length);
}
break;
}
}
}
return false;
}
}
}
-449
View File
@@ -1,449 +0,0 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Threading;
using Internal.Runtime.CompilerServices;
namespace System.Buffers
{
#if __MonoCS__
public ref partial struct SequenceReader<T> where T : IEquatable<T>
#else
public ref partial struct SequenceReader<T> where T : unmanaged, IEquatable<T>
#endif
{
private SequencePosition _currentPosition;
private SequencePosition _nextPosition;
private bool _moreData;
#if __MonoCS__
private long _length;
#else
private readonly long _length;
#endif
/// <summary>
/// Create a <see cref="SequenceReader{T}"/> over the given <see cref="ReadOnlySequence{T}"/>.
/// </summary>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public SequenceReader(ReadOnlySequence<T> sequence)
{
CurrentSpanIndex = 0;
Consumed = 0;
Sequence = sequence;
_currentPosition = sequence.Start;
_length = -1;
sequence.GetFirstSpan(out ReadOnlySpan<T> first, out _nextPosition);
CurrentSpan = first;
_moreData = first.Length > 0;
if (!_moreData && !sequence.IsSingleSegment)
{
_moreData = true;
GetNextSpan();
}
}
/// <summary>
/// True when there is no more data in the <see cref="Sequence"/>.
/// </summary>
#if __MonoCS__
public bool End => !_moreData;
#else
public readonly bool End => !_moreData;
#endif
/// <summary>
/// The underlying <see cref="ReadOnlySequence{T}"/> for the reader.
/// </summary>
#if __MonoCS__
public ReadOnlySequence<T> Sequence { get; }
#else
public readonly ReadOnlySequence<T> Sequence { get; }
#endif
/// <summary>
/// The current position in the <see cref="Sequence"/>.
/// </summary>
#if __MonoCS__
public SequencePosition Position
=> Sequence.GetPosition(CurrentSpanIndex, _currentPosition);
#else
public readonly SequencePosition Position
=> Sequence.GetPosition(CurrentSpanIndex, _currentPosition);
#endif
/// <summary>
/// The current segment in the <see cref="Sequence"/> as a span.
/// </summary>
#if __MonoCS__
public ReadOnlySpan<T> CurrentSpan { get; private set; }
#else
public ReadOnlySpan<T> CurrentSpan { readonly get; private set; }
#endif
/// <summary>
/// The index in the <see cref="CurrentSpan"/>.
/// </summary>
#if __MonoCS__
public int CurrentSpanIndex { get; private set; }
#else
public int CurrentSpanIndex { readonly get; private set; }
#endif
/// <summary>
/// The unread portion of the <see cref="CurrentSpan"/>.
/// </summary>
#if __MonoCS__
public ReadOnlySpan<T> UnreadSpan
#else
public readonly ReadOnlySpan<T> UnreadSpan
#endif
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => CurrentSpan.Slice(CurrentSpanIndex);
}
/// <summary>
/// The total number of <typeparamref name="T"/>'s processed by the reader.
/// </summary>
#if __MonoCS__
public long Consumed { get; private set; }
#else
public long Consumed { readonly get; private set; }
#endif
/// <summary>
/// Remaining <typeparamref name="T"/>'s in the reader's <see cref="Sequence"/>.
/// </summary>
#if __MonoCS__
public long Remaining => Length - Consumed;
#else
public readonly long Remaining => Length - Consumed;
#endif
/// <summary>
/// Count of <typeparamref name="T"/> in the reader's <see cref="Sequence"/>.
/// </summary>
#if __MonoCS__
public long Length
#else
public readonly long Length
#endif
{
get
{
if (_length < 0)
{
unsafe {
fixed (long* lenPtr = &_length)
// Cast-away readonly to initialize lazy field
Volatile.Write(ref Unsafe.AsRef<long>(lenPtr), Sequence.Length);
}
}
return _length;
}
}
/// <summary>
/// Peeks at the next value without advancing the reader.
/// </summary>
/// <param name="value">The next value or default if at the end.</param>
/// <returns>False if at the end of the reader.</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
#if __MonoCS__
public bool TryPeek(out T value)
#else
public readonly bool TryPeek(out T value)
#endif
{
if (_moreData)
{
value = CurrentSpan[CurrentSpanIndex];
return true;
}
else
{
value = default;
return false;
}
}
/// <summary>
/// Read the next value and advance the reader.
/// </summary>
/// <param name="value">The next value or default if at the end.</param>
/// <returns>False if at the end of the reader.</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool TryRead(out T value)
{
if (End)
{
value = default;
return false;
}
value = CurrentSpan[CurrentSpanIndex];
CurrentSpanIndex++;
Consumed++;
if (CurrentSpanIndex >= CurrentSpan.Length)
{
GetNextSpan();
}
return true;
}
/// <summary>
/// Move the reader back the specified number of items.
/// </summary>
/// <exception cref="ArgumentOutOfRangeException">
/// Thrown if trying to rewind a negative amount or more than <see cref="Consumed"/>.
/// </exception>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Rewind(long count)
{
if ((ulong)count > (ulong)Consumed)
{
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
}
Consumed -= count;
if (CurrentSpanIndex >= count)
{
CurrentSpanIndex -= (int)count;
_moreData = true;
}
else
{
// Current segment doesn't have enough data, scan backward through segments
RetreatToPreviousSpan(Consumed);
}
}
[MethodImpl(MethodImplOptions.NoInlining)]
private void RetreatToPreviousSpan(long consumed)
{
ResetReader();
Advance(consumed);
}
private void ResetReader()
{
CurrentSpanIndex = 0;
Consumed = 0;
_currentPosition = Sequence.Start;
_nextPosition = _currentPosition;
if (Sequence.TryGet(ref _nextPosition, out ReadOnlyMemory<T> memory, advance: true))
{
_moreData = true;
if (memory.Length == 0)
{
CurrentSpan = default;
// No data in the first span, move to one with data
GetNextSpan();
}
else
{
CurrentSpan = memory.Span;
}
}
else
{
// No data in any spans and at end of sequence
_moreData = false;
CurrentSpan = default;
}
}
/// <summary>
/// Get the next segment with available data, if any.
/// </summary>
private void GetNextSpan()
{
if (!Sequence.IsSingleSegment)
{
SequencePosition previousNextPosition = _nextPosition;
while (Sequence.TryGet(ref _nextPosition, out ReadOnlyMemory<T> memory, advance: true))
{
_currentPosition = previousNextPosition;
if (memory.Length > 0)
{
CurrentSpan = memory.Span;
CurrentSpanIndex = 0;
return;
}
else
{
CurrentSpan = default;
CurrentSpanIndex = 0;
previousNextPosition = _nextPosition;
}
}
}
_moreData = false;
}
/// <summary>
/// Move the reader ahead the specified number of items.
/// </summary>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Advance(long count)
{
const long TooBigOrNegative = unchecked((long)0xFFFFFFFF80000000);
if ((count & TooBigOrNegative) == 0 && CurrentSpan.Length - CurrentSpanIndex > (int)count)
{
CurrentSpanIndex += (int)count;
Consumed += count;
}
else
{
// Can't satisfy from the current span
AdvanceToNextSpan(count);
}
}
/// <summary>
/// Unchecked helper to avoid unnecessary checks where you know count is valid.
/// </summary>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal void AdvanceCurrentSpan(long count)
{
Debug.Assert(count >= 0);
Consumed += count;
CurrentSpanIndex += (int)count;
if (CurrentSpanIndex >= CurrentSpan.Length)
GetNextSpan();
}
/// <summary>
/// Only call this helper if you know that you are advancing in the current span
/// with valid count and there is no need to fetch the next one.
/// </summary>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal void AdvanceWithinSpan(long count)
{
Debug.Assert(count >= 0);
Consumed += count;
CurrentSpanIndex += (int)count;
Debug.Assert(CurrentSpanIndex < CurrentSpan.Length);
}
private void AdvanceToNextSpan(long count)
{
if (count < 0)
{
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
}
Consumed += count;
while (_moreData)
{
int remaining = CurrentSpan.Length - CurrentSpanIndex;
if (remaining > count)
{
CurrentSpanIndex += (int)count;
count = 0;
break;
}
// As there may not be any further segments we need to
// push the current index to the end of the span.
CurrentSpanIndex += remaining;
count -= remaining;
Debug.Assert(count >= 0);
GetNextSpan();
if (count == 0)
{
break;
}
}
if (count != 0)
{
// Not enough data left- adjust for where we actually ended and throw
Consumed -= count;
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
}
}
/// <summary>
/// Copies data from the current <see cref="Position"/> to the given <paramref name="destination"/> span if there
/// is enough data to fill it.
/// </summary>
/// <remarks>
/// This API is used to copy a fixed amount of data out of the sequence if possible. It does not advance
/// the reader. To look ahead for a specific stream of data <see cref="IsNext(ReadOnlySpan{T}, bool)"/> can be used.
/// </remarks>
/// <param name="destination">Destination span to copy to.</param>
/// <returns>True if there is enough data to completely fill the <paramref name="destination"/> span.</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
#if __MonoCS__
public bool TryCopyTo(Span<T> destination)
#else
public readonly bool TryCopyTo(Span<T> destination)
#endif
{
// This API doesn't advance to facilitate conditional advancement based on the data returned.
// We don't provide an advance option to allow easier utilizing of stack allocated destination spans.
// (Because we can make this method readonly we can guarantee that we won't capture the span.)
ReadOnlySpan<T> firstSpan = UnreadSpan;
if (firstSpan.Length >= destination.Length)
{
firstSpan.Slice(0, destination.Length).CopyTo(destination);
return true;
}
// Not enough in the current span to satisfy the request, fall through to the slow path
return TryCopyMultisegment(destination);
}
#if __MonoCS__
internal bool TryCopyMultisegment(Span<T> destination)
#else
internal readonly bool TryCopyMultisegment(Span<T> destination)
#endif
{
// If we don't have enough to fill the requested buffer, return false
if (Remaining < destination.Length)
return false;
ReadOnlySpan<T> firstSpan = UnreadSpan;
Debug.Assert(firstSpan.Length < destination.Length);
firstSpan.CopyTo(destination);
int copied = firstSpan.Length;
SequencePosition next = _nextPosition;
while (Sequence.TryGet(ref next, out ReadOnlyMemory<T> nextSegment, true))
{
if (nextSegment.Length > 0)
{
ReadOnlySpan<T> nextSpan = nextSegment.Span;
int toCopy = Math.Min(nextSpan.Length, destination.Length - copied);
nextSpan.Slice(0, toCopy).CopyTo(destination.Slice(copied));
copied += toCopy;
if (copied >= destination.Length)
{
break;
}
}
}
return true;
}
}
}
@@ -1,187 +0,0 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Buffers.Binary;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Internal.Runtime.CompilerServices;
namespace System.Buffers
{
#if !__MonoCS__
public static partial class SequenceReaderExtensions
{
/// <summary>
/// Try to read the given type out of the buffer if possible. Warning: this is dangerous to use with arbitrary
/// structs- see remarks for full details.
/// </summary>
/// <remarks>
/// IMPORTANT: The read is a straight copy of bits. If a struct depends on specific state of it's members to
/// behave correctly this can lead to exceptions, etc. If reading endian specific integers, use the explicit
/// overloads such as <see cref="TryReadLittleEndian(ref SequenceReader{byte}, out short)"/>
/// </remarks>
/// <returns>
/// True if successful. <paramref name="value"/> will be default if failed (due to lack of space).
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal static unsafe bool TryRead<T>(ref this SequenceReader<byte> reader, out T value) where T : unmanaged
{
ReadOnlySpan<byte> span = reader.UnreadSpan;
if (span.Length < sizeof(T))
return TryReadMultisegment(ref reader, out value);
value = Unsafe.ReadUnaligned<T>(ref MemoryMarshal.GetReference(span));
reader.Advance(sizeof(T));
return true;
}
private static unsafe bool TryReadMultisegment<T>(ref SequenceReader<byte> reader, out T value) where T : unmanaged
{
Debug.Assert(reader.UnreadSpan.Length < sizeof(T));
// Not enough data in the current segment, try to peek for the data we need.
T buffer = default;
Span<byte> tempSpan = new Span<byte>(&buffer, sizeof(T));
if (!reader.TryCopyTo(tempSpan))
{
value = default;
return false;
}
value = Unsafe.ReadUnaligned<T>(ref MemoryMarshal.GetReference(tempSpan));
reader.Advance(sizeof(T));
return true;
}
/// <summary>
/// Reads an <see cref="short"/> as little endian.
/// </summary>
/// <returns>False if there wasn't enough data for an <see cref="short"/>.</returns>
public static bool TryReadLittleEndian(ref this SequenceReader<byte> reader, out short value)
{
if (BitConverter.IsLittleEndian)
{
return reader.TryRead(out value);
}
return TryReadReverseEndianness(ref reader, out value);
}
/// <summary>
/// Reads an <see cref="short"/> as big endian.
/// </summary>
/// <returns>False if there wasn't enough data for an <see cref="short"/>.</returns>
public static bool TryReadBigEndian(ref this SequenceReader<byte> reader, out short value)
{
if (!BitConverter.IsLittleEndian)
{
return reader.TryRead(out value);
}
return TryReadReverseEndianness(ref reader, out value);
}
private static bool TryReadReverseEndianness(ref SequenceReader<byte> reader, out short value)
{
if (reader.TryRead(out value))
{
value = BinaryPrimitives.ReverseEndianness(value);
return true;
}
return false;
}
/// <summary>
/// Reads an <see cref="int"/> as little endian.
/// </summary>
/// <returns>False if there wasn't enough data for an <see cref="int"/>.</returns>
public static bool TryReadLittleEndian(ref this SequenceReader<byte> reader, out int value)
{
if (BitConverter.IsLittleEndian)
{
return reader.TryRead(out value);
}
return TryReadReverseEndianness(ref reader, out value);
}
/// <summary>
/// Reads an <see cref="int"/> as big endian.
/// </summary>
/// <returns>False if there wasn't enough data for an <see cref="int"/>.</returns>
public static bool TryReadBigEndian(ref this SequenceReader<byte> reader, out int value)
{
if (!BitConverter.IsLittleEndian)
{
return reader.TryRead(out value);
}
return TryReadReverseEndianness(ref reader, out value);
}
private static bool TryReadReverseEndianness(ref SequenceReader<byte> reader, out int value)
{
if (reader.TryRead(out value))
{
value = BinaryPrimitives.ReverseEndianness(value);
return true;
}
return false;
}
/// <summary>
/// Reads an <see cref="long"/> as little endian.
/// </summary>
/// <returns>False if there wasn't enough data for an <see cref="long"/>.</returns>
public static bool TryReadLittleEndian(ref this SequenceReader<byte> reader, out long value)
{
if (BitConverter.IsLittleEndian)
{
return reader.TryRead(out value);
}
return TryReadReverseEndianness(ref reader, out value);
}
/// <summary>
/// Reads an <see cref="long"/> as big endian.
/// </summary>
/// <returns>False if there wasn't enough data for an <see cref="long"/>.</returns>
public static bool TryReadBigEndian(ref this SequenceReader<byte> reader, out long value)
{
if (!BitConverter.IsLittleEndian)
{
return reader.TryRead(out value);
}
return TryReadReverseEndianness(ref reader, out value);
}
private static bool TryReadReverseEndianness(ref SequenceReader<byte> reader, out long value)
{
if (reader.TryRead(out value))
{
value = BinaryPrimitives.ReverseEndianness(value);
return true;
}
return false;
}
}
#else
public static partial class SequenceReaderExtensions
{
public static bool TryReadBigEndian(this System.Buffers.SequenceReader<byte> reader, out short value) => throw new PlatformNotSupportedException();
public static bool TryReadBigEndian(this System.Buffers.SequenceReader<byte> reader, out int value) => throw new PlatformNotSupportedException();
public static bool TryReadBigEndian(this System.Buffers.SequenceReader<byte> reader, out long value) => throw new PlatformNotSupportedException();
public static bool TryReadLittleEndian(this System.Buffers.SequenceReader<byte> reader, out short value) => throw new PlatformNotSupportedException();
public static bool TryReadLittleEndian(this System.Buffers.SequenceReader<byte> reader, out int value) => throw new PlatformNotSupportedException();
public static bool TryReadLittleEndian(this System.Buffers.SequenceReader<byte> reader, out long value) => throw new PlatformNotSupportedException();
}
#endif
}
+1 -6
View File
@@ -336,7 +336,6 @@
<Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\DaylightTime.cs" />
<Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\DigitShapes.cs" />
<Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\GlobalizationExtensions.cs" />
<Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\HebrewNumber.cs" />
<Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\InternalGlobalizationHelper.cs" />
<Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\NumberStyles.cs" />
<Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\SortVersion.cs" />
@@ -1073,6 +1072,7 @@
<Compile Include="..\referencesource\mscorlib\system\globalization\gregoriancalendarhelper.cs" />
<Compile Include="..\referencesource\mscorlib\system\globalization\gregoriancalendartypes.cs" />
<Compile Include="..\referencesource\mscorlib\system\globalization\hebrewcalendar.cs" />
<Compile Include="..\referencesource\mscorlib\system\globalization\hebrewnumber.cs" />
<Compile Include="..\referencesource\mscorlib\system\globalization\hijricalendar.cs" />
<Compile Include="..\referencesource\mscorlib\system\globalization\japanesecalendar.cs" />
<Compile Include="..\referencesource\mscorlib\system\globalization\japaneselunisolarcalendar.cs" />
@@ -1861,7 +1861,6 @@
<Compile Include="coreclr\SorterArray.cs" />
<Compile Include="corefx\AesCcm.cs" />
<Compile Include="corefx\AesGcm.cs" />
<Compile Include="corefx\ArrayBufferWriter.cs" />
<Compile Include="corefx\AwaitTaskContinuation.cs" />
<Compile Include="corefx\BinaryEnums.cs" />
<Compile Include="corefx\CompareInfo.cs" />
@@ -1880,7 +1879,6 @@
<Compile Include="corefx\IncrementingPollingCounter.cs" />
<Compile Include="corefx\MethodInfo.cs" />
<Compile Include="corefx\MonoLinqHelper.cs" />
<Compile Include="corefx\NullableAttributes.cs" />
<Compile Include="corefx\PbeEncryptionAlgorithm.cs" />
<Compile Include="corefx\PbeParameters.cs" />
<Compile Include="corefx\PollingCounter.cs" />
@@ -1889,9 +1887,6 @@
<Compile Include="corefx\RuntimeImports.cs" />
<Compile Include="corefx\SR.cs" />
<Compile Include="corefx\SR.missing.cs" />
<Compile Include="corefx\SequenceReader.Search.cs" />
<Compile Include="corefx\SequenceReader.cs" />
<Compile Include="corefx\SequenceReaderExtensions.Binary.cs" />
<Compile Include="corefx\Stream.cs" />
<Compile Include="corefx\SwitchExpressionException.cs" />
<Compile Include="corefx\SynchronizationContext.cs" />
+1 -6
View File
@@ -1105,7 +1105,7 @@ ReferenceSources/AppContextDefaultValues.cs
../referencesource/mscorlib/system/globalization/gregoriancalendarhelper.cs
../referencesource/mscorlib/system/globalization/gregoriancalendartypes.cs
../referencesource/mscorlib/system/globalization/hebrewcalendar.cs
../../../external/corefx/src/Common/src/CoreLib/System/Globalization/HebrewNumber.cs
../referencesource/mscorlib/system/globalization/hebrewnumber.cs
../referencesource/mscorlib/system/globalization/hijricalendar.cs
../referencesource/mscorlib/system/globalization/japanesecalendar.cs
../referencesource/mscorlib/system/globalization/japaneselunisolarcalendar.cs
@@ -1631,11 +1631,6 @@ corefx/AesGcm.cs
corefx/IncrementingEventCounter.cs
corefx/IncrementingPollingCounter.cs
corefx/PollingCounter.cs
corefx/NullableAttributes.cs
corefx/ArrayBufferWriter.cs
corefx/SequenceReader.cs
corefx/SequenceReader.Search.cs
corefx/SequenceReaderExtensions.Binary.cs
corert/DependencyReductionRootAttribute.cs
corert/AddrofIntrinsics.cs
+1 -12
View File
@@ -22,7 +22,6 @@ install-local:
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7-api
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.1-api
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.2-api
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.8-api
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.5-api/Facades
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.5.1-api/Facades
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.5.2-api/Facades
@@ -32,7 +31,6 @@ install-local:
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7-api/Facades
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.1-api/Facades
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.2-api/Facades
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.8-api/Facades
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v2.0/*.dll $(PROFILE_DIR)/2.0-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v3.5/*.dll $(PROFILE_DIR)/3.5-api
@@ -46,7 +44,6 @@ install-local:
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7/*.dll $(PROFILE_DIR)/4.7-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7.1/*.dll $(PROFILE_DIR)/4.7.1-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7.2/*.dll $(PROFILE_DIR)/4.7.2-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.8/*.dll $(PROFILE_DIR)/4.8-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.5/Facades/*.dll $(PROFILE_DIR)/4.5-api/Facades
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.5.1/Facades/*.dll $(PROFILE_DIR)/4.5.1-api/Facades
@@ -57,7 +54,6 @@ install-local:
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7/Facades/*.dll $(PROFILE_DIR)/4.7-api/Facades
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7.1/Facades/*.dll $(PROFILE_DIR)/4.7.1-api/Facades
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7.2/Facades/*.dll $(PROFILE_DIR)/4.7.2-api/Facades
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.8/Facades/*.dll $(PROFILE_DIR)/4.8-api/Facades
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/2.0-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.0-api
@@ -69,11 +65,9 @@ install-local:
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.6.2-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.7-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.7.1-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.7.2-api
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.8-api
rm -f $(PROFILE_DIR)/4.7.1-api/ICSharpCode.SharpZipLib.dll
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.7.2-api
rm -f $(PROFILE_DIR)/4.7.2-api/ICSharpCode.SharpZipLib.dll
rm -f $(PROFILE_DIR)/4.8-api/ICSharpCode.SharpZipLib.dll
# Unfortunately, a few programs (most notably NUnit and FSharp) have hardcoded checks for <prefix>/lib/mono/4.0/mscorlib.dll or Mono.Posix.dll,
# so we need to place something there or those tools break. We decided to symlink to the reference assembly for now.
@@ -83,7 +77,6 @@ install-local:
ln -sf ../4.0-api/Mono.Posix.dll $(PROFILE_DIR)/4.0/Mono.Posix.dll
DISTFILES = \
$(wildcard ../../../external/binary-reference-assemblies/v4.8/Facades/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/v4.7.2/Facades/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/v4.7.1/Facades/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/v4.7/Facades/*.dll) \
@@ -93,7 +86,6 @@ DISTFILES = \
$(wildcard ../../../external/binary-reference-assemblies/v4.5.2/Facades/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/v4.5.1/Facades/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/v4.5/Facades/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/v4.8/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/v4.7.2/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/v4.7.1/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/v4.7/*.dll) \
@@ -107,7 +99,6 @@ DISTFILES = \
$(wildcard ../../../external/binary-reference-assemblies/v3.5/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/v2.0/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/mono/*.dll) \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.8/Facades/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7.2/Facades/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7.1/Facades/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7/Facades/*.cs) \
@@ -117,7 +108,6 @@ DISTFILES = \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.5.2/Facades/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.5.1/Facades/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.5/Facades/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.8/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7.2/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7.1/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7/*.cs) \
@@ -131,7 +121,6 @@ DISTFILES = \
$(wildcard ../../../external/binary-reference-assemblies/src/v3.5/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/v2.0/*.cs) \
$(wildcard ../../../external/binary-reference-assemblies/src/mono/*.cs) \
../../../external/binary-reference-assemblies/v4.8/Makefile \
../../../external/binary-reference-assemblies/v4.7.2/Makefile \
../../../external/binary-reference-assemblies/v4.7.1/Makefile \
../../../external/binary-reference-assemblies/v4.7/Makefile \
@@ -7851,7 +7851,7 @@ namespace System.Net.Sockets {
if (s_LoggingEnabled) Logging.Enter(Logging.Sockets, null, "ConnectAsync", "");
// Throw if multiple buffers specified.
if (e.m_BufferList != null) {
if (e.BufferList != null) {
throw new ArgumentException(SR.GetString(SR.net_multibuffernotsupported), "BufferList");
}
@@ -19,9 +19,8 @@ namespace System.Diagnostics {
using System.IO;
using System.Text;
using System.Runtime.InteropServices;
using System.Threading;
using System.Collections;
using Microsoft.Win32.SafeHandles;
using System.Threading;
using System.Collections;
internal delegate void UserCallBack(String data);
@@ -59,10 +58,10 @@ namespace System.Diagnostics {
// Cache the last position scanned in sb when searching for lines.
private int currentLinePos;
#if MONO
//users to coordinate between Dispose and ReadBuffer
private object syncObject = new Object ();
private IAsyncResult asyncReadResult = null;
//users to coordinate between Dispose and BeginReadLine
private object syncObject = new Object ();
#endif
internal AsyncStreamReader(Process process, Stream stream, UserCallBack callback, Encoding encoding)
@@ -116,31 +115,8 @@ namespace System.Diagnostics {
lock (syncObject) {
#endif
if (disposing) {
if (stream != null) {
#if MONO
if (asyncReadResult != null && !asyncReadResult.IsCompleted) {
// Closing underlying stream when having pending async read request in progress is
// not portable and racy by design. Try to cancel pending async read before closing stream.
// We are still holding lock that will prevent new async read requests to queue up
// before we have closed and invalidated the stream.
if (stream is FileStream) {
SafeHandle tmpStreamHandle = ((FileStream)stream).SafeFileHandle;
while (!asyncReadResult.IsCompleted) {
MonoIOError error;
if (!MonoIO.Cancel (tmpStreamHandle, out error) && error == MonoIOError.ERROR_NOT_SUPPORTED) {
// Platform don't support canceling pending IO requests on stream. If an async pending read
// is still in flight when closing stream, it could trigger a race condition.
break;
}
// Wait for a short time for pending async read to cancel/complete/fail.
asyncReadResult.AsyncWaitHandle.WaitOne (200);
}
}
}
#endif
if (stream != null)
stream.Close();
}
}
if (stream != null) {
stream = null;
@@ -175,11 +151,7 @@ namespace System.Diagnostics {
if( sb == null ) {
sb = new StringBuilder(DefaultBufferSize);
#if MONO
asyncReadResult = stream.BeginRead (byteBuffer, 0 , byteBuffer.Length, new AsyncCallback (ReadBuffer), null);
#else
stream.BeginRead(byteBuffer, 0 , byteBuffer.Length, new AsyncCallback(ReadBuffer), null);
#endif
}
else {
FlushMessageQueue();
@@ -197,17 +169,12 @@ namespace System.Diagnostics {
try {
#if MONO
lock (syncObject) {
Debug.Assert (ar.IsCompleted);
asyncReadResult = null;
if (this.stream == null)
byteLen = 0;
else
byteLen = stream.EndRead (ar);
}
#else
byteLen = stream.EndRead(ar);
var stream = this.stream;
if (stream == null)
byteLen = 0;
else
#endif
byteLen = stream.EndRead(ar);
}
catch (IOException ) {
// We should ideally consume errors from operations getting cancelled
@@ -275,10 +242,10 @@ retry_dispose:
byteLen = 0;
goto retry_dispose;
}
asyncReadResult = stream.BeginRead (byteBuffer, 0 , byteBuffer.Length, new AsyncCallback(ReadBuffer), null);
}
#else
#endif
stream.BeginRead(byteBuffer, 0 , byteBuffer.Length, new AsyncCallback(ReadBuffer), null);
#if MONO
}
#endif
}
}
@@ -1316,7 +1316,11 @@ namespace System.Threading
{
// capture the sync context
if (0 == (options & CaptureOptions.IgnoreSyncCtx))
#if MONO
syncCtxNew = ecCurrent.SynchronizationContext;
#else
syncCtxNew = (ecCurrent.SynchronizationContext == null) ? null : ecCurrent.SynchronizationContext.CreateCopy();
#endif
#if FEATURE_REMOTING
// copy over the Logical Call Context
-1
View File
@@ -257,7 +257,6 @@ namespace Mono.CSharp
sdk_directory.Add ("4.7", new string [] { "4.7-api", "v4.0.30319" });
sdk_directory.Add ("4.7.1", new string [] { "4.7.1-api", "v4.0.30319" });
sdk_directory.Add ("4.7.2", new string [] { "4.7.2-api", "v4.0.30319" });
sdk_directory.Add ("4.8", new string [] { "4.8-api", "v4.0.30319" });
sdk_directory.Add ("4.x", new string [] { "4.5", "net_4_x", "v4.0.30319" });
}
+1 -3
View File
@@ -54,15 +54,13 @@ net_4_5_dirs := \
build_SUBDIRS =
build_PARALLEL_SUBDIRS := resgen gacutil security culevel upload-to-sentry mono-helix-client commoncryptogenerator resx2sr linker cil-strip corcompare mono-api-diff mono-api-html
monodroid_tools_SUBDIRS =
monodroid_tools_PARALLEL_SUBDIRS = aprofutil cil-strip linker-analyzer mkbundle mdoc mono-symbolicate corcompare mono-api-diff mono-api-html pdb2mdb nunit-lite
monodroid_tools_PARALLEL_SUBDIRS = cil-strip linker-analyzer mkbundle mdoc mono-symbolicate corcompare mono-api-diff mono-api-html pdb2mdb nunit-lite
monodroid_SUBDIRS = nunit-lite
monotouch_SUBDIRS = nunit-lite
monotouch_tv_SUBDIRS = nunit-lite
monotouch_watch_SUBDIRS = nunit-lite
monotouch_tools_SUBDIRS =
monotouch_tools_PARALLEL_SUBDIRS = corcompare mono-api-html
xammac_SUBDIRS = nunit-lite
xammac_net_4_5_SUBDIRS = nunit-lite
net_4_x_SUBDIRS =
net_4_x_PARALLEL_SUBDIRS = $(net_4_5_dirs)
wasm_tools_SUBDIRS =
+17 -84
View File
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Net.Sockets;
using System.Text.RegularExpressions;
using Mono.Options;
using Mono.Profiler.Aot;
@@ -12,7 +11,6 @@ namespace aotprofiletool {
class MainClass {
static readonly string Name = "aotprofile-tool";
static bool AdbForward;
static bool Methods;
static bool Modules;
static bool Summary;
@@ -25,8 +23,6 @@ namespace aotprofiletool {
static string Output;
static int Port = -1;
static string ProcessArguments (string [] args)
{
var help = false;
@@ -47,27 +43,21 @@ namespace aotprofiletool {
{ "d|modules",
"Show modules in the profile",
v => Modules = true },
{ "f|adb-forward",
"Set adb socket forwarding for Android",
v => AdbForward = true },
{ "filter-method=",
"Filter by method with regex {VALUE}",
"Filter by method with regex VALUE",
v => FilterMethod = new Regex (v) },
{ "filter-module=",
"Filter by module with regex {VALUE}",
"Filter by module with regex VALUE",
v => FilterModule = new Regex (v) },
{ "filter-type=",
"Filter by type with regex {VALUE}",
"Filter by type with regex VALUE",
v => FilterType = new Regex (v) },
{ "m|methods",
"Show methods in the profile",
v => Methods = true },
{ "o|output=",
"Write profile to {OUTPUT} file",
"Write profile to OUTPUT file",
v => Output = v },
{ "p|port=",
"Read profile from aot profiler using local connection on {PORT}",
v => int.TryParse (v, out Port) },
{ "s|summary",
"Show summary of the profile",
v => Summary = true },
@@ -89,92 +79,35 @@ namespace aotprofiletool {
Environment.Exit (0);
}
if (remaining.Count != 1 && Port < 0) {
Error ("Please specify one <aotprofile-file> to process or network PORT with -p.");
if (remaining.Count != 1) {
Error ("Please specify one <aotprofile-file> to process.");
Environment.Exit (2);
}
return remaining.Count > 0 ? remaining [0] : null;
}
static ProfileData ReadProfileFromPort (ProfileReader reader)
{
ProfileData pd;
if (AdbForward) {
var cmdArgs = $"forward tcp:{Port} tcp:{Port}";
if (Verbose)
ColorWriteLine ($"Calling 'adb {cmdArgs}'...", ConsoleColor.Yellow);
System.Diagnostics.Process.Start ("adb", cmdArgs);
}
using (var client = new TcpClient ("127.0.0.1", Port)) {
using (var stream = client.GetStream ()) {
var msgData = System.Text.Encoding.ASCII.GetBytes ("save\n");
stream.Write (msgData, 0, msgData.Length);
if (Verbose)
ColorWriteLine ($"Reading from '127.0.0.1:{Port}'...", ConsoleColor.Yellow);
using (var memoryStream = new MemoryStream (128 * 1024)) {
var data = new byte [4 * 1024];
int len;
while ((len = stream.Read (data, 0, data.Length)) > 0) {
memoryStream.Write (data, 0, len);
if (Verbose)
ColorWrite ($"Read {len} bytes...\r", ConsoleColor.Yellow);
}
if (Verbose)
ColorWriteLine ($"Read total {memoryStream.Length} bytes...", ConsoleColor.Yellow);
memoryStream.Seek (0, SeekOrigin.Begin);
pd = reader.ReadAllData (memoryStream);
}
}
}
return pd;
return remaining [0];
}
public static void Main (string [] args)
{
var path = ProcessArguments (args);
if (!File.Exists (path)) {
Error ($"'{path}' doesn't exist.");
Environment.Exit (3);
}
if (args.Length == 1) {
Modules = Types = Methods = true;
}
var reader = new ProfileReader ();
ProfileData pd = null;
ProfileData pd;
if (path == null) {
if (Port < 0) {
Error ($"You should specify path or -p PORT to read the profile.");
Environment.Exit (4);
} else {
try {
pd = ReadProfileFromPort (reader);
} catch (Exception e) {
Error ($"Unable to read profile through local port: {Port}.\n{e}");
Environment.Exit (5);
}
}
} else if (!File.Exists (path)) {
Error ($"'{path}' doesn't exist.");
Environment.Exit (3);
} else {
using (var stream = new FileStream (path, FileMode.Open)) {
if (Verbose)
ColorWriteLine ($"Reading '{path}'...", ConsoleColor.Yellow);
using (var stream = new FileStream (path, FileMode.Open)) {
if (Verbose)
ColorWriteLine ($"Reading '{path}'...", ConsoleColor.Yellow);
pd = reader.ReadAllData (stream);
}
pd = reader.ReadAllData (stream);
}
List<MethodRecord> methods = new List<MethodRecord> (pd.Methods);
+2 -6
View File
@@ -28,11 +28,6 @@
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' ">
<OutputPath>./../../class/lib/monodroid_tools</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monodroid_tools</IntermediateOutputPath>
<DefineConstants>NET_4_6;MONO;MONODROID_TOOLS;WIN_PLATFORM</DefineConstants>
</PropertyGroup>
<!-- @ALL_PROFILE_PROPERTIES@ -->
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
@@ -54,7 +49,8 @@
</ItemGroup>
<!--End of common files-->
<!-- @ALL_SOURCES@ -->
<ItemGroup>
<!-- @COMMON_PROJECT_REFERENCES@ -->
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
<ProjectReference Include="../../class/System/System.csproj" />
<ProjectReference Include="../../class/System.Core/System.Core.csproj" />
<ProjectReference Include="../../class/Mono.Profiler.Log/Mono.Profiler.Log.csproj" />
+3 -2
View File
@@ -27,7 +27,6 @@ TEST_CASES := \
ifdef INCLUDE_DISABLED
TEST_CASES += \
System.Core/test-queryable-01.cs \
System.Runtime.Serialization/test-dcs-01.cs \
mscorlib/test-marshaling.cs
endif
@@ -41,7 +40,9 @@ endif
ifndef AOT_FRIENDLY_PROFILE
TEST_CASES += \
mscorlib/test-remoting.cs \
mscorlib/test-reflection.cs
mscorlib/test-reflection.cs \
System.Core/test-queryable-01.cs \
System.Core/test-queryable-02.cs
endif
TESTS_COMPILER = $(MCS) -nologo -noconfig -unsafe -nostdlib -debug:portable -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll
@@ -1,21 +1,30 @@
using System;
using System.Linq.Expressions;
using System.Runtime.InteropServices;
using System.Linq;
public class QueryableUsedViaExpression {
public class TestQueryableOrderBy
{
public static void Main ()
{
var q = "Test".AsQueryable ();
var count = CallQueryableCount (q);
q.Count ();
//Console.WriteLine ($"count: {count}");
Test ();
}
public static int CallQueryableCount (IQueryable source)
class Pet
{
return source.Provider.Execute<int> (
Expression.Call (
typeof (Queryable), "Count",
new Type [] { source.ElementType }, source.Expression));
public string Name { get; set; }
public int Age { get; set; }
}
static void Test ()
{
Pet[] pets = { new Pet { Name="Barley", Age=8 },
new Pet { Name="Boots", Age=4 },
new Pet { Name="Whiskers", Age=1 }
};
var query = pets.AsQueryable ().OrderByDescending (pet => pet.Age);
foreach (Pet pet in query)
Console.WriteLine("{0} - {1}", pet.Name, pet.Age);
}
}
@@ -0,0 +1,20 @@
using System;
using System.Linq.Expressions;
using System.Linq;
public class QueryableUsedViaExpression {
public static void Main ()
{
var q = "Test".AsQueryable ();
var count = CallQueryableCount (q);
Console.WriteLine ($"count: {count}");
}
public static int CallQueryableCount (IQueryable source)
{
return source.Provider.Execute<int> (
Expression.Call (
typeof (Queryable), "Count",
new Type [] { source.ElementType }, source.Expression));
}
}
+4 -2
View File
@@ -1,5 +1,7 @@
App,mscorlib.dll,System.dll,System.Core.dll,System.Xml.dll,I18N.CJK.dll,I18N.MidEast.dll,I18N.Other.dll,I18N.Rare.dll,I18N.West.dll,I18N.dll,Microsoft.CSharp.dll,System.ComponentModel.Composition.dll,System.ComponentModel.DataAnnotations.dll,System.Data.Services.Client.dll,System.Data.dll,System.IO.Compression.FileSystem.dll,System.IO.Compression.dll,System.IdentityModel.dll,System.Json.dll,System.Net.Http.WinHttpHandler.dll,System.Net.Http.dll,System.Net.dll,System.Numerics.Vectors.dll,System.Numerics.dll,System.Reflection.Context.dll,System.Runtime.CompilerServices.Unsafe.dll,System.Runtime.Serialization.dll,System.Security.dll,System.ServiceModel.Internals.dll,System.ServiceModel.Web.dll,System.ServiceModel.dll,System.Transactions.dll,System.Web.Services.dll,System.Windows.dll,System.Xml.Linq.dll,System.Xml.Serialization.dll
System.Core/test-plinq-01.exe,1585664,12800,63488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Core/test-plinq-01.exe,1586176,12800,63488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Core/test-queryable-01.exe,1910784,14336,385024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Core/test-queryable-02.exe,1910784,14336,385536,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Net.Http/test-handler-01.exe,1913856,101376,26624,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10240,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
System/test-security.exe,1907712,71168,26624,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-array.exe,1579008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -10,7 +12,7 @@ mscorlib/test-exception-01.exe,1579008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-locale-01.exe,1581056,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-methodimpl-01.exe,1579008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-01.exe,1579008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-02.exe,1589248,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-02.exe,1588736,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-03.exe,1580032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-04.exe,1588736,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection.exe,1873920,13824,24576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1 App mscorlib.dll System.dll System.Core.dll System.Xml.dll I18N.CJK.dll I18N.MidEast.dll I18N.Other.dll I18N.Rare.dll I18N.West.dll I18N.dll Microsoft.CSharp.dll System.ComponentModel.Composition.dll System.ComponentModel.DataAnnotations.dll System.Data.Services.Client.dll System.Data.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.IdentityModel.dll System.Json.dll System.Net.Http.WinHttpHandler.dll System.Net.Http.dll System.Net.dll System.Numerics.Vectors.dll System.Numerics.dll System.Reflection.Context.dll System.Runtime.CompilerServices.Unsafe.dll System.Runtime.Serialization.dll System.Security.dll System.ServiceModel.Internals.dll System.ServiceModel.Web.dll System.ServiceModel.dll System.Transactions.dll System.Web.Services.dll System.Windows.dll System.Xml.Linq.dll System.Xml.Serialization.dll
2 System.Core/test-plinq-01.exe 1585664 1586176 12800 63488 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3 System.Core/test-queryable-01.exe 1910784 14336 385024 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4 System.Core/test-queryable-02.exe 1910784 14336 385536 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5 System.Net.Http/test-handler-01.exe 1913856 101376 26624 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10240 0 0 25600 0 0 0 0 0 0 0 0 0 0 0 0
6 System/test-security.exe 1907712 71168 26624 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25600 0 0 0 0 0 0 0 0 0 0 0 0
7 mscorlib/test-array.exe 1579008 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
12 mscorlib/test-locale-01.exe 1581056 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
13 mscorlib/test-methodimpl-01.exe 1579008 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
14 mscorlib/test-reflection-01.exe 1579008 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
15 mscorlib/test-reflection-02.exe 1589248 1588736 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
16 mscorlib/test-reflection-03.exe 1580032 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
17 mscorlib/test-reflection-04.exe 1588736 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
18 mscorlib/test-reflection.exe 1873920 13824 24576 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5 -5
View File
@@ -1,7 +1,7 @@
App,mscorlib.dll,System.dll,System.Core.dll,System.Xml.dll,I18N.CJK.dll,I18N.MidEast.dll,I18N.Other.dll,I18N.Rare.dll,I18N.West.dll,I18N.dll,Microsoft.CSharp.dll,System.ComponentModel.Composition.dll,System.ComponentModel.DataAnnotations.dll,System.Data.Services.Client.dll,System.Data.dll,System.IO.Compression.FileSystem.dll,System.IO.Compression.dll,System.IdentityModel.dll,System.Json.dll,System.Net.Http.WinHttpHandler.dll,System.Net.Http.dll,System.Net.dll,System.Numerics.Vectors.dll,System.Numerics.dll,System.Reflection.Context.dll,System.Runtime.CompilerServices.Unsafe.dll,System.Runtime.Serialization.dll,System.Security.dll,System.ServiceModel.Internals.dll,System.ServiceModel.Web.dll,System.ServiceModel.dll,System.Transactions.dll,System.Web.Services.dll,System.Windows.dll,System.Xml.Linq.dll,System.Xml.Serialization.dll
Newtonsoft.Json.Test/bin/iPhoneSimulator/Release/Newtonsoft.Json.Test.exe,1833472,672768,373248,420864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35840,0,0,0,0,0,0,0,0,0,0,30720,0
System.Core/test-plinq-01.exe,1021440,13824,60928,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Net.Http/test-handler-01.exe,1467392,574464,8192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9728,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
Newtonsoft.Json.Test/bin/iPhoneSimulator/Release/Newtonsoft.Json.Test.exe,1830400,672256,369152,420864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35840,0,0,0,0,0,0,0,0,0,0,30720,0
System.Core/test-plinq-01.exe,1020928,13824,60928,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Net.Http/test-handler-01.exe,1467904,574976,8192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9728,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
System/test-security.exe,1404928,64512,8192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-array.exe,1014784,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-calendar-01.exe,1014784,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -11,9 +11,9 @@ mscorlib/test-exception-01.exe,1014784,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-locale-01.exe,1016832,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-methodimpl-01.exe,1014784,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-01.exe,1014784,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-02.exe,1028608,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-02.exe,1025536,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-03.exe,1027584,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-04.exe,1028096,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-04.exe,1025024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-01.exe,1014784,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-02.exe,1014784,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-03.exe,1023488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1 App mscorlib.dll System.dll System.Core.dll System.Xml.dll I18N.CJK.dll I18N.MidEast.dll I18N.Other.dll I18N.Rare.dll I18N.West.dll I18N.dll Microsoft.CSharp.dll System.ComponentModel.Composition.dll System.ComponentModel.DataAnnotations.dll System.Data.Services.Client.dll System.Data.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.IdentityModel.dll System.Json.dll System.Net.Http.WinHttpHandler.dll System.Net.Http.dll System.Net.dll System.Numerics.Vectors.dll System.Numerics.dll System.Reflection.Context.dll System.Runtime.CompilerServices.Unsafe.dll System.Runtime.Serialization.dll System.Security.dll System.ServiceModel.Internals.dll System.ServiceModel.Web.dll System.ServiceModel.dll System.Transactions.dll System.Web.Services.dll System.Windows.dll System.Xml.Linq.dll System.Xml.Serialization.dll
2 Newtonsoft.Json.Test/bin/iPhoneSimulator/Release/Newtonsoft.Json.Test.exe 1833472 1830400 672768 672256 373248 369152 420864 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 35840 0 0 0 0 0 0 0 0 0 0 30720 0
3 System.Core/test-plinq-01.exe 1021440 1020928 13824 60928 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4 System.Net.Http/test-handler-01.exe 1467392 1467904 574464 574976 8192 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9728 0 0 25600 0 0 0 0 0 0 0 0 0 0 0 0
5 System/test-security.exe 1404928 64512 8192 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25600 0 0 0 0 0 0 0 0 0 0 0 0
6 mscorlib/test-array.exe 1014784 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
7 mscorlib/test-calendar-01.exe 1014784 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
11 mscorlib/test-locale-01.exe 1016832 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
12 mscorlib/test-methodimpl-01.exe 1014784 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
13 mscorlib/test-reflection-01.exe 1014784 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
14 mscorlib/test-reflection-02.exe 1028608 1025536 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
15 mscorlib/test-reflection-03.exe 1027584 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
16 mscorlib/test-reflection-04.exe 1028096 1025024 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
17 mscorlib/test-string-01.exe 1014784 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
18 mscorlib/test-string-02.exe 1014784 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
19 mscorlib/test-string-03.exe 1023488 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+20 -18
View File
@@ -1,20 +1,22 @@
App,mscorlib.dll,System.dll,System.Core.dll,System.Xml.dll,I18N.CJK.dll,I18N.MidEast.dll,I18N.Other.dll,I18N.Rare.dll,I18N.West.dll,I18N.dll,Microsoft.Build.Engine.dll,Microsoft.Build.Framework.dll,Microsoft.Build.Tasks.v4.0.dll,Microsoft.Build.Utilities.v4.0.dll,Microsoft.Build.dll,Microsoft.CSharp.dll,Microsoft.VisualC.dll,Microsoft.Web.Infrastructure.dll,System.ComponentModel.Composition.dll,System.ComponentModel.DataAnnotations.dll,System.Configuration.Install.dll,System.Configuration.dll,System.Data.DataSetExtensions.dll,System.Data.Entity.dll,System.Data.Linq.dll,System.Data.OracleClient.dll,System.Data.Services.Client.dll,System.Data.Services.dll,System.Data.dll,System.Deployment.dll,System.Design.dll,System.DirectoryServices.Protocols.dll,System.DirectoryServices.dll,System.Drawing.Design.dll,System.Drawing.dll,System.Dynamic.dll,System.EnterpriseServices.dll,System.IO.Compression.FileSystem.dll,System.IO.Compression.dll,System.IdentityModel.Selectors.dll,System.IdentityModel.dll,System.Json.Microsoft.dll,System.Json.dll,System.Management.dll,System.Messaging.dll,System.Net.Http.Formatting.dll,System.Net.Http.WebRequest.dll,System.Net.Http.dll,System.Net.dll,System.Numerics.Vectors.dll,System.Numerics.dll,System.Reactive.Core.dll,System.Reactive.Debugger.dll,System.Reactive.Experimental.dll,System.Reactive.Interfaces.dll,System.Reactive.Linq.dll,System.Reactive.Observable.Aliases.dll,System.Reactive.PlatformServices.dll,System.Reactive.Providers.dll,System.Reactive.Runtime.Remoting.dll,System.Reactive.Windows.Forms.dll,System.Reactive.Windows.Threading.dll,System.Reflection.Context.dll,System.Runtime.Caching.dll,System.Runtime.CompilerServices.Unsafe.dll,System.Runtime.DurableInstancing.dll,System.Runtime.Remoting.dll,System.Runtime.Serialization.Formatters.Soap.dll,System.Runtime.Serialization.dll,System.Security.dll,System.ServiceModel.Activation.dll,System.ServiceModel.Discovery.dll,System.ServiceModel.Internals.dll,System.ServiceModel.Routing.dll,System.ServiceModel.Web.dll,System.ServiceModel.dll,System.ServiceProcess.dll,System.Threading.Tasks.Dataflow.dll,System.Transactions.dll,System.Web.Abstractions.dll,System.Web.ApplicationServices.dll,System.Web.DynamicData.dll,System.Web.Extensions.Design.dll,System.Web.Extensions.dll,System.Web.Http.SelfHost.dll,System.Web.Http.WebHost.dll,System.Web.Http.dll,System.Web.Mobile.dll,System.Web.Mvc.dll,System.Web.Razor.dll,System.Web.RegularExpressions.dll,System.Web.Routing.dll,System.Web.Services.dll,System.Web.WebPages.Deployment.dll,System.Web.WebPages.Razor.dll,System.Web.WebPages.dll,System.Web.dll,System.Windows.Forms.DataVisualization.dll,System.Windows.Forms.dll,System.Windows.dll,System.Workflow.Activities.dll,System.Workflow.ComponentModel.dll,System.Workflow.Runtime.dll,System.Xaml.dll,System.Xml.Linq.dll,System.Xml.Serialization.dll
Newtonsoft.Json.Test/bin/Release/Newtonsoft.Json.Test.exe,2387968,984576,346624,1320448,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56832,0,0,0,0,0,0,616448,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6144,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35840,0
System.Core/test-plinq-01.exe,1584128,67072,63488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System/test-security.exe,2165248,803328,7168,693760,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51712,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-array.exe,1577472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-calendar-01.exe,1577472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-calendar-02.exe,1577472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-exception-01.exe,1577472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-locale-01.exe,1579520,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-methodimpl-01.exe,1577472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-01.exe,1577472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-02.exe,1587200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-03.exe,1678848,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Newtonsoft.Json.Test/bin/Release/Newtonsoft.Json.Test.exe,2390016,985088,346624,1318400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56832,0,0,0,0,0,0,616448,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6144,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35840,0
System.Core/test-plinq-01.exe,1584640,67072,63488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Core/test-queryable-01.exe,2000896,62464,365056,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Core/test-queryable-02.exe,2000896,62464,365568,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System/test-security.exe,2174976,804352,7168,693760,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51712,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-array.exe,1577984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-calendar-01.exe,1577984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-calendar-02.exe,1577984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-exception-01.exe,1577984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-locale-01.exe,1580032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-methodimpl-01.exe,1577984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-01.exe,1577984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-02.exe,1587712,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-03.exe,1679360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-04.exe,1587200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection.exe,1963520,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-remoting.exe,1577472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-01.exe,1577472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-02.exe,1577472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-03.exe,1581568,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-task-01.exe,1581056,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection.exe,1964032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-remoting.exe,1577984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-01.exe,1577984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-02.exe,1577984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-03.exe,1582592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-task-01.exe,1582080,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1 App mscorlib.dll System.dll System.Core.dll System.Xml.dll I18N.CJK.dll I18N.MidEast.dll I18N.Other.dll I18N.Rare.dll I18N.West.dll I18N.dll Microsoft.Build.Engine.dll Microsoft.Build.Framework.dll Microsoft.Build.Tasks.v4.0.dll Microsoft.Build.Utilities.v4.0.dll Microsoft.Build.dll Microsoft.CSharp.dll Microsoft.VisualC.dll Microsoft.Web.Infrastructure.dll System.ComponentModel.Composition.dll System.ComponentModel.DataAnnotations.dll System.Configuration.Install.dll System.Configuration.dll System.Data.DataSetExtensions.dll System.Data.Entity.dll System.Data.Linq.dll System.Data.OracleClient.dll System.Data.Services.Client.dll System.Data.Services.dll System.Data.dll System.Deployment.dll System.Design.dll System.DirectoryServices.Protocols.dll System.DirectoryServices.dll System.Drawing.Design.dll System.Drawing.dll System.Dynamic.dll System.EnterpriseServices.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.IdentityModel.Selectors.dll System.IdentityModel.dll System.Json.Microsoft.dll System.Json.dll System.Management.dll System.Messaging.dll System.Net.Http.Formatting.dll System.Net.Http.WebRequest.dll System.Net.Http.dll System.Net.dll System.Numerics.Vectors.dll System.Numerics.dll System.Reactive.Core.dll System.Reactive.Debugger.dll System.Reactive.Experimental.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.Observable.Aliases.dll System.Reactive.PlatformServices.dll System.Reactive.Providers.dll System.Reactive.Runtime.Remoting.dll System.Reactive.Windows.Forms.dll System.Reactive.Windows.Threading.dll System.Reflection.Context.dll System.Runtime.Caching.dll System.Runtime.CompilerServices.Unsafe.dll System.Runtime.DurableInstancing.dll System.Runtime.Remoting.dll System.Runtime.Serialization.Formatters.Soap.dll System.Runtime.Serialization.dll System.Security.dll System.ServiceModel.Activation.dll System.ServiceModel.Discovery.dll System.ServiceModel.Internals.dll System.ServiceModel.Routing.dll System.ServiceModel.Web.dll System.ServiceModel.dll System.ServiceProcess.dll System.Threading.Tasks.Dataflow.dll System.Transactions.dll System.Web.Abstractions.dll System.Web.ApplicationServices.dll System.Web.DynamicData.dll System.Web.Extensions.Design.dll System.Web.Extensions.dll System.Web.Http.SelfHost.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Web.Mobile.dll System.Web.Mvc.dll System.Web.Razor.dll System.Web.RegularExpressions.dll System.Web.Routing.dll System.Web.Services.dll System.Web.WebPages.Deployment.dll System.Web.WebPages.Razor.dll System.Web.WebPages.dll System.Web.dll System.Windows.Forms.DataVisualization.dll System.Windows.Forms.dll System.Windows.dll System.Workflow.Activities.dll System.Workflow.ComponentModel.dll System.Workflow.Runtime.dll System.Xaml.dll System.Xml.Linq.dll System.Xml.Serialization.dll
2 Newtonsoft.Json.Test/bin/Release/Newtonsoft.Json.Test.exe 2387968 2390016 984576 985088 346624 1320448 1318400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 56832 0 0 0 0 0 0 616448 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 36864 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6144 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 35840 0
3 System.Core/test-plinq-01.exe 1584128 1584640 67072 63488 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4 System/test-security.exe System.Core/test-queryable-01.exe 2165248 2000896 803328 62464 7168 365056 693760 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51712 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5 mscorlib/test-array.exe System.Core/test-queryable-02.exe 1577472 2000896 0 62464 0 365568 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6 mscorlib/test-calendar-01.exe System/test-security.exe 1577472 2174976 0 804352 0 7168 0 693760 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51712 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
7 mscorlib/test-calendar-02.exe mscorlib/test-array.exe 1577472 1577984 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
8 mscorlib/test-exception-01.exe mscorlib/test-calendar-01.exe 1577472 1577984 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
9 mscorlib/test-locale-01.exe mscorlib/test-calendar-02.exe 1579520 1577984 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
10 mscorlib/test-methodimpl-01.exe mscorlib/test-exception-01.exe 1577472 1577984 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
11 mscorlib/test-reflection-01.exe mscorlib/test-locale-01.exe 1577472 1580032 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
12 mscorlib/test-reflection-02.exe mscorlib/test-methodimpl-01.exe 1587200 1577984 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
13 mscorlib/test-reflection-03.exe mscorlib/test-reflection-01.exe 1678848 1577984 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
14 mscorlib/test-reflection-02.exe 1587712 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
15 mscorlib/test-reflection-03.exe 1679360 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
16 mscorlib/test-reflection-04.exe 1587200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
17 mscorlib/test-reflection.exe 1963520 1964032 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
18 mscorlib/test-remoting.exe 1577472 1577984 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
19 mscorlib/test-string-01.exe 1577472 1577984 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
20 mscorlib/test-string-02.exe 1577472 1577984 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
21 mscorlib/test-string-03.exe 1581568 1582592 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
22 mscorlib/test-task-01.exe 1581056 1582080 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+23 -23
View File
@@ -1,23 +1,23 @@
App,mscorlib.dll,System.dll,System.Core.dll,System.Xml.dll,I18N.CJK.dll,I18N.MidEast.dll,I18N.Other.dll,I18N.Rare.dll,I18N.West.dll,I18N.dll,Microsoft.CSharp.dll,System.ComponentModel.Composition.dll,System.ComponentModel.DataAnnotations.dll,System.Data.Services.Client.dll,System.Data.dll,System.IO.Compression.FileSystem.dll,System.IO.Compression.dll,System.IdentityModel.dll,System.Json.dll,System.Net.Http.WinHttpHandler.dll,System.Net.Http.dll,System.Net.dll,System.Numerics.Vectors.dll,System.Numerics.dll,System.Reflection.Context.dll,System.Runtime.CompilerServices.Unsafe.dll,System.Runtime.Serialization.dll,System.Security.dll,System.ServiceModel.Internals.dll,System.ServiceModel.Web.dll,System.ServiceModel.dll,System.Transactions.dll,System.Web.Services.dll,System.Windows.dll,System.Xml.Linq.dll,System.Xml.Serialization.dll
BlazingPizza.Client/bin/Release/netstandard2.0/BlazingPizza.Client.dll,1191936,101376,287744,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10752,0,0,0,0,3072,0,0,0,0,0,0,0,0,0,0
HelloWorld/bin/Release/netstandard2.0/dist/_framework/_bin/HelloWorld.dll,1170944,100864,286720,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10752,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Microsoft.AspNetCore.Blazor.E2EPerformance/bin/Release/netstandard2.0/Microsoft.AspNetCore.Blazor.E2EPerformance.dll,1211392,102912,287744,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10752,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Newtonsoft/bin/Release/netstandard2.0/dist/_framework/_bin/Newtonsoft.dll,1170944,100864,286720,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10752,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Core/test-plinq-01.exe,613888,12288,60928,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Net.Http/test-handler-01.exe,779264,41472,7168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System/test-security.exe,1098240,70144,26624,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-array.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-calendar-01.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-calendar-02.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-crypto-01.exe,880640,11264,24064,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-exception-01.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-locale-01.exe,561664,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-methodimpl-01.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-01.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-02.exe,568320,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-03.exe,657920,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-04.exe,568320,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-01.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-02.exe,553472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-03.exe,562176,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-task-01.exe,611328,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
App,mscorlib.dll,System.dll,System.Core.dll,System.Xml.dll,I18N.CJK.dll,I18N.MidEast.dll,I18N.Other.dll,I18N.Rare.dll,I18N.West.dll,I18N.dll,Microsoft.CSharp.dll,System.ComponentModel.Composition.dll,System.ComponentModel.DataAnnotations.dll,System.Data.dll,System.IO.Compression.FileSystem.dll,System.IO.Compression.dll,System.Net.Http.dll,System.Numerics.Vectors.dll,System.Numerics.dll,System.Runtime.CompilerServices.Unsafe.dll,System.Runtime.Serialization.dll,System.Security.dll,System.ServiceModel.Internals.dll,System.Transactions.dll,System.Xml.Linq.dll
BlazingPizza.Client/bin/Release/netstandard2.0/BlazingPizza.Client.dll,1191936,101376,287744,0,0,0,0,0,0,0,0,0,0,0,0,0,10752,0,0,3072,0,0,0,0,0
HelloWorld/bin/Release/netstandard2.0/dist/_framework/_bin/HelloWorld.dll,1170432,100864,286720,0,0,0,0,0,0,0,0,0,0,0,0,0,10752,0,0,0,0,0,0,0,0
Microsoft.AspNetCore.Blazor.E2EPerformance/bin/Release/netstandard2.0/Microsoft.AspNetCore.Blazor.E2EPerformance.dll,1210880,102912,287744,0,0,0,0,0,0,0,0,0,0,0,0,0,10752,0,0,0,0,0,0,0,0
Newtonsoft/bin/Release/netstandard2.0/dist/_framework/_bin/Newtonsoft.dll,1170432,100864,286720,0,0,0,0,0,0,0,0,0,0,0,0,0,10752,0,0,0,0,0,0,0,0
System.Core/test-plinq-01.exe,613888,12288,60928,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
System.Net.Http/test-handler-01.exe,779264,41472,7168,0,0,0,0,0,0,0,0,0,0,0,0,0,8192,0,0,0,0,0,0,0,0
System/test-security.exe,1098240,70144,26624,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0
mscorlib/test-array.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-calendar-01.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-calendar-02.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-crypto-01.exe,880640,11264,24064,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-exception-01.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-locale-01.exe,561664,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-methodimpl-01.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-01.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-02.exe,565760,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-03.exe,657920,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-reflection-04.exe,565248,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-01.exe,552960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-02.exe,553472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-string-03.exe,562176,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
mscorlib/test-task-01.exe,611328,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1 App mscorlib.dll System.dll System.Core.dll System.Xml.dll I18N.CJK.dll I18N.MidEast.dll I18N.Other.dll I18N.Rare.dll I18N.West.dll I18N.dll Microsoft.CSharp.dll System.ComponentModel.Composition.dll System.ComponentModel.DataAnnotations.dll System.Data.Services.Client.dll System.Data.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.Net.Http.dll System.IdentityModel.dll System.Numerics.Vectors.dll System.Json.dll System.Numerics.dll System.Net.Http.WinHttpHandler.dll System.Runtime.CompilerServices.Unsafe.dll System.Runtime.Serialization.dll System.Net.dll System.Security.dll System.ServiceModel.Internals.dll System.Transactions.dll System.Reflection.Context.dll System.Xml.Linq.dll System.ServiceModel.Web.dll System.ServiceModel.dll System.Web.Services.dll System.Windows.dll System.Xml.Serialization.dll
2 BlazingPizza.Client/bin/Release/netstandard2.0/BlazingPizza.Client.dll 1191936 101376 287744 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10752 0 0 0 0 0 3072 0 0 0 0 0 0 0 0 0 0 0 0
3 HelloWorld/bin/Release/netstandard2.0/dist/_framework/_bin/HelloWorld.dll 1170944 1170432 100864 286720 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10752 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4 Microsoft.AspNetCore.Blazor.E2EPerformance/bin/Release/netstandard2.0/Microsoft.AspNetCore.Blazor.E2EPerformance.dll 1211392 1210880 102912 287744 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10752 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5 Newtonsoft/bin/Release/netstandard2.0/dist/_framework/_bin/Newtonsoft.dll 1170944 1170432 100864 286720 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10752 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6 System.Core/test-plinq-01.exe 613888 12288 60928 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
7 System.Net.Http/test-handler-01.exe 779264 41472 7168 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8192 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
8 System/test-security.exe 1098240 70144 26624 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25600 0 0 0 0 0 0 0 0 0 0 0 0 0 0
9 mscorlib/test-array.exe 552960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
10 mscorlib/test-calendar-01.exe 552960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
11 mscorlib/test-calendar-02.exe 552960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
12 mscorlib/test-crypto-01.exe 880640 11264 24064 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
13 mscorlib/test-exception-01.exe 552960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
14 mscorlib/test-locale-01.exe 561664 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
15 mscorlib/test-methodimpl-01.exe 552960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
16 mscorlib/test-reflection-01.exe 552960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
17 mscorlib/test-reflection-02.exe 568320 565760 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
18 mscorlib/test-reflection-03.exe 657920 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
19 mscorlib/test-reflection-04.exe 568320 565248 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
20 mscorlib/test-string-01.exe 552960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
21 mscorlib/test-string-02.exe 553472 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
22 mscorlib/test-string-03.exe 562176 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23 mscorlib/test-task-01.exe 611328 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-3
View File
@@ -83,8 +83,6 @@ install-frameworks:
$(INSTALL_DATA) frameworks/net_4.7.1.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7.1/RedistList/FrameworkList.xml
$(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7.2/RedistList
$(INSTALL_DATA) frameworks/net_4.7.2.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7.2/RedistList/FrameworkList.xml
$(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.8/RedistList
$(INSTALL_DATA) frameworks/net_4.8.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.8/RedistList/FrameworkList.xml
install-pcl-targets:
$(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)
@@ -195,7 +193,6 @@ EXTRA_DISTFILES = \
frameworks/net_4.7.xml \
frameworks/net_4.7.1.xml \
frameworks/net_4.7.2.xml \
frameworks/net_4.8.xml \
targets/Microsoft.WebApplication.targets \
$(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props \
$(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets \
Loaded 100 of 1057 files, more files were not shown because too many files have changed in this diff. Show more